Some search view model fixes