fix HRepository + refactor
merge