MYLOC-59 - Fixing message module to work with search results