Use Query instead of QueryBuilder in services
Merge remote-tracking branch 'origin/master'
QueryBuilder holds information about query correctly