LPS-32160 Apply QueryDefinition to MBMessageService