[TASK] Adapt to changes in gridelements

Fixes #612