Satya - Bug fixes

UAT20, policydetails labels and connections, UAT003