PR Fixup: Not so many queries
PR Fixup: use routes pattern