Escape URLs properly and rename #options