Merges changes to the properties files search and profile controls.
Merge pull request #892 from fmoloney/SnippetFestMerged

Merges changes to the properties files search and profile controls.