Add key conditions as required conditions to Query because they are, despite what the doc says