refactoring search controller to close #1591
Merge remote-tracking branch 'origin/marianne-sprint' into dev-merge

Conflicts:
	ckanext-hdx_search/ckanext/hdx_search/controllers/search_controller.py
Merge pull request #1639 from OCHA-DAP/dev-merge

Dev merge