Fix feature to work with multiple site