Bug fix to UUID support TagAPI