Fix use with no filter
Unit tests