Date filter and distance adder working correctly