Search field updates
Merge pull request #2299 from flukeout/searchfield

Search field updates