fix bug - entity picker - pick correct table