Added helper to fix url
Simplified syntax