Data with space

This PR fixes bugs with data with embedded space like:

KEYWORD
   'ITEM WITH SPACE' /

Which used to break the thing.