updating reportxform mapping

removing nested from case props - basic case queries wouldn't work without being fiddly and annoying