add/remove filters feature & some minor tweaks