SSP-813 Minor update to fix Disability Rept.
SSP-650 Redid query to restrict alias generation.
This fix may work. Not able to reproduce issue. There were some minor
inaccuracies in the way the query was generated. (Extra alias were being
created that may cause an issue.) Query should be cleaner at a minimum.