#13 Fix support for multiple site