Fixed attribute names and geometry issues

2 jobs for debug in 4 minutes and 15 seconds (queued for 1 minute and 36 seconds)