Timeouts in topology list now correct

This should be backported to stable
Fixes #611