I think a generalization of all basic types like mountain, lake, hill, desert, etc to something like geological formation would be helpful, particularly when adding properties to other types that can have any one of the above-mentioned types. For e.g. specifying a terrain for a sport or leisure activity or things to do-in in a tourist location etc.
