Fix to filter empty element