Added fix for tag and collection related issues