[PR] Resolve issues with ID concatenation and disappearing indexes