entity key performance tweaks