QueryModifier can work with AbstractQuery, small refactor of QueryResolver into separate functions
Updated query resolver spec