[Issue #3] Fixed site names issue

Additionaly some useful changes applied