Fixed items to work on multiple site config