Regression from #1793500 that broke "Display even if view has no result"

Checked, works as expected.

This could be considered a regression in 3.25 as prior to that it did not check count_query.

I think the patch needed a little tidying.

Committed. Thank you.

Automatically closed - issue fixed for 2 weeks with no activity.