enhance filter url logic