fix for #94 + bug fix in `site` blocks