Search model bug fix