Added filtering the community