Remove 'taxonomy' prefix, and avoid error messages.

#5281