Added autocomplete (not implemented yet), also added update (upsert) on properties.