fixed search widgets and models