#1254 - fix search controller issues
Merge pull request #1296 from OCHA-DAP/arti-sprint-32

#1254 - fix search controller issues