Yep, that is fixed like that. I've done it locally just like that. I think, though, that the game still loads with those present.
As for the update for the mapfiller tool: I am still struggling to make pre-generated bare-bones bookmarks work. The button on the left never seems to get rendered in my test mod.
