Tweaks to taxonomy name var and fixes for single value taxonomy options in taxonomy registration