Feature/new queries filters