adding support for indicator type controlled vocabulary