#6 gup custom search modifications
Merge branch 'bug/6-custom-search-modifications' into dev