change some topics to queues