autofill now gracefully handles data from master and v0.3.x branch