Improve number conversion code
Don't return empty values
Add support for renaming fields to the shapefile source