Issue #1548552, Make sure a row_index always exists.
Issue #1885048, Remove extra $.
fix errors