revert no subtype filterquery