Improve initialDate lookup for inputs with an addon