2.0 taxonomy tweaks