Updated search place holder
Merge branch 'develop' into hash_cache_keys