Enhanced query filter blocks [rebased and updated]#39

goldenapples wants to merge 5 commits intomainhumanmade/query-filter:mainfrom

enhanced-query-filter-blocks-updatedhumanmade/query-filter:enhanced-query-filter-blocks-updatedCopy head branch name to clipboard