Fix edit/update Activity to use autocomplete & refactor a bit