17 Commits (feature/queries-not-option)