Improves content URL handling