Fixing issue where incorrect queue was found when component name was a 'substring' of another component name in a different queue
Fixing issue where incorrect queue was found when component name was a 'substring'
of another component name in a different queue

BBC-News/alephant-preview