Changing variables names according to right grammar
Updating Taxonomy parser since it had code that didn't match with the Taxonomy call
Adding Taxonomy constants used in the call