* improved entity list handling