Fix the filtering by empty string