Use a numeric feature ID instead of directly copying the string ID from the shapefile

N.B. Please leave merging the branch to me (Urmila) - without running the appropriate migration script immediately afterwards (which I am still working on), staging will be broken.
BTW, toOption is strictly not needed with getOrElse.