Change group query with new method.