Added locality and address filter