Added semicolon separated tagging