Ensure grid generation gets the proper interactivity fields