Adding query UI to handle date picker in form