Contactables filter refactor