Better filtering and URL updated