Fix bug with mapped devices
The new implementation wasn't consistently getting the choices for mapped readable and moveable. This tries to fix that issue.
The new implementation wasn't consistently getting the choices for mapped readable and moveable. This tries to fix that issue.