remove non ajax search, make ajax primary version, tweak data models to return better filtering