further improvements on handling custom taxonomies