Small refactoring of the sparql table