fix runquery on new selection on filter
merge with master