Added currentDate parameter to query to fix #565.  Caused by fix to #546.