Fixed search issue