I guess your change is a way of dealing with the TODO above? If yes we should also remove the TODO. Another (better) way would have been to add visual fields for all keys we find in the data, but I agree this might be too much for a tutorial.