Change xpath for finding cells to more efficient version