Issue-68: remove esc_url, it's too early