Fixed issues with taxonomy code