Partial fix to separate init_popit_data from set_resolver_for_date