Added filtering for names