Enhance control over url