fixed sitefilter, prepare for new version, various bugfixes
fix