Cluster user

Can you take care of substring in case getAll*Queries methods as well?