Adding filtering capabilities and optional params are now retained on resubmitting new filter