Fixed the issue with the null entries issue

The MainScreenController queries have been updated
-Updated the graphs so that they still display the data
-Chronologically