Tried to fix search filters... mostly failed.