Final fix for tags in amazon