Fixed subscription issues for MQ