Fixed URLs not being properly mapped

Fixes #125 and #127