REPORTS-228: Fixed broken queries.
REPORTS-228: Fixed Datepicker issue