Added filtering in the popup