Exclude empty rs

use the ``exclude_empty`` param added to the service

Unit tests are now fixed.