Arch: Enhanced Space tool - fixes #1610