Bugfix escape urls and merged master to develop