small fixes for switching to the new taxonomy model