extra check for device selection
fix reversed source-to-content mapping