Fixed nativeInfo request, query index and matching