query:1.0.2 - Fixed responses for availability edge-cases