Did some more clean up and made sure tags filters were working.