remove site and use dict_key instead