improve url match