continuing conversion to query builder. Filters converted to hooks and store operations mostly converted.