Restoring call to filterDate()
Some indentation improvements