add query and type filter support