more grid filtering work  - still needs major testing and tuning