Change name of #two_sided_time_range, collapse #one_sided_time_range into #string_conditions