added autocomplete, new fields and admin sorting