Improve SPARQL serialization