WP-3066: Adjust connecting link URLs to include the type.
WP-3067: Use plural keys for options map.