fix loading entry and refactor service calling