added indexes and fixed enum multiple values for keyword choices problem