Fixed issue where drilling in to device shows wrong device