Refactoring: Query, Step 1 and KeyOptions