please fix code after line 234 in balisearchpanel
Merge origin/InDev into InDev