fix query group