fix for name search, other tinkering. most features not working