fixed search and model attributes