Impprovments to GenericEntityPicker and GenericEntityTable