Add QueryFilter support