sime fix in parsing
Move to concept of key/value RS