Query tables updated for customer rep
Resolve merge conflict