Commenting out setupAutocomplete as we might not need it. Couple other fixes