Fixed tagging support
Added CLI output when the locator is generated