clean up query routing

I cleaned up some of the query routing. It no longer doubles up on the list pages.