More improvements to amqp monitor