Removing default lookups for message information and fixing issue where
device was not populated correctly