SSP-1217 Minor fix to querys, improper names added ui for ssgs.