Only check joseki once in query
Merge branch 'master' into sparql-distinct
Remove unused code