url changes handling bugfix part 2