Add filter for future limit to non recurring appointments, update js conditional checks to be simpler