SSP-921 Updating SQL to address issues found in earlier fix commit