reverted autocomplete and added clustering
Merge branch 'development'