Use groonga repository correctly for non-initial case