add support for keter, and don't shadow site id param