Allow Group.query to be null