Make granularity filter truly optional