Bug 21526: Use the 'url' filter when needed