Index hack to use always same site
Merge branch 'dev' into feature/generic_controller