Introduce uri matcher for slightly less if else if code, domain now works with actual calendars not the serialised long version of time