Made url override more flexible: