Minor correction, add logic for if param name == "Date".