Handle queries with zero responses
Release v2.5.3