added optional preset searches
Merge 'master' into 'presets' branch