typeahead and calendar fix