some refactoring / missing phpDocs added
Merge branch 'feature/refactor-search' into develop

* feature/refactor-search:
  some refactoring / missing phpDocs added