Update to grid filter and animation