Added "Advanced Search" filtering
Merge branch 'AdvancedSearchFilter' into merge-everything