-More Nepomuk2 refactorization.