Reworked the dimension lookup – fixes #154
Make top-level modeler save work