updated for grid filter