url changes handling bugfix