CDB-269 #resolve Improves filter queries