Merge pull request #214 from bounswe/backend/feature/213-search-fields

Merge pull request #214 from bounswe/backend/feature/213-search-fields #40