fix record field reference resolution and highlighting