OPTICS refactoring - still returning only 1 cluster and takes too much time