Updated Sp's

Fixed consolidate usages for correct handling with missing data
Fixed total usage sp