Issue #961 - Fix search bars