fixing /ADV case for index rows