fixup query
FIXUP: Squash route and GH patch with this