Fix data access for fields with spaces