Fixing Issue #111 - prompts that should accept name or UUID only accepting UUID