Improved SPARQL templates
Cleaner matchmaker's JS