Bug 1041026 - Move search bar logic into custom view