Add comment, use timezone instead of naive datetime object for date filtering
Add more data to template