feature/248/filterQuery