Changing around soem sparql queries to be more efficient