Improves speed

Avoid to do request to WikidataQuery when possible