handle empty topics
remove extra topics query