fixed search bug with dashes, added keywords to some models