NUM-115: Respond to the correct queue and extra logging