Bug fixes
Start url template support