Fixing weird highlighting issues

Was changing the positions of selections because span wasn't accounted
for