Fixed the tags filters and cleaned up Fortify stuff.