minor refactor in grid and Rescue