Attempt to fix query overload users