Support for search filters
Merge remote-tracking branch 'upstream/master'