Fixed - add is:unit filter by default