Didn't need a query model after all