Slight readjustments to search
Merge branch 'search'