Fix issue where searching doens't work