Fixed attribute parsing to match spaces