refactor repository finders + some fixes