Improve reference positions in Editor