More refactor and relocation of filters to make web apps consistent.