No reuse of search string
Removed one TODO and one dpm()
Merge branch 'feature/1182_customsearch_again' into develop