Fix option only showing top-level spaces