Change to different escaping for attributes and relocate a lot of esc_urls in url functions