Added query features for the API