WP-2861 added tags
WP-2861 Changed url per Naveens request