Fixed topology height related issues and made it configurable