#46 filtering query keys