Feature/fix enum use tag as value