Search issue refixed