added filter; fixed site option