Improved diagram-sparql