deleted unused queries and added topic filter