Resolved highlighting issues