Fixed CLIENT_MULTI_RESULTS support