Few bug-fixes with search panel