general improvements in order to avoid double repository index/creation