My sub highlight #1295

we should make sure this is taken care of everywhere