Check in fix for seperating two devices list.  One for available devices
and the other for currently used devices