Simplify problem query