Query panel fixes