Better result return in queries for multiple results