bugfixes, url changes handling