Added support for tagging in single select fields