More cleanup still and search filters (WIP)