Fixed the exclude empty values