fix where panel lookup issues