Lots of changes to search. Need to pull out Type stuff from basic search and pages which use it, next. Rely on new Filters.