cleaned up some search models