Upgraded Clustering to search by numbers