modified peaks/clusters query and test