Fixing county calculation when no completion date is present