search bar fix
and
bug fix