one possible solution for the urls problem. though not perfect.
url handling changes, bugfix