Allow downloads shortcode to take both ID and slug for cats and tags

Rework for 2.0.1, issue #1922