Improve handling Standalone_Type as index