Added query parameter and OpenSearch support