Corrected Total Counts for Filtered Results

This returns the Correct Filtered Total. Unit Tests are corrected as well.