Update to version of query supporting date reformatting