This has side-effects as some border elements are also tagged for other
uses (rivers in particular), we want to keep those.