Minor edits to sparql queries for performance; confirmed that it still passes 68/68 tests.