Add support for website properties

Also fixed a bunch of issues related to handling of tagged
and extended properies