add filters and upgrade Viewer