Fixes for MQ client, handling of query topics in the config