Improve empty result tracking