#673 fix merge error on search bar