adding locking cluster registry, and cluster_labels to query layers