Better workaround for esc_url stripping spaces #4842