Add URL filters option, clear up async stuff