Added back in tags

Added tags in and ditched the settings check