diff --git a/bitmovin-analytics-datasource/src/components/OrderByInput.tsx b/bitmovin-analytics-datasource/src/components/OrderByInput.tsx
index 41311bc..033a3fc 100644
--- a/bitmovin-analytics-datasource/src/components/OrderByInput.tsx
+++ b/bitmovin-analytics-datasource/src/components/OrderByInput.tsx
@@ -20,7 +20,7 @@ type Props = {
   readonly onReorderOrderBy: (direction: REORDER_DIRECTION) => void;
 };
 
-const sortOrderOption: SelectableValue<QuerySortOrder>[] = [
+const sortOrderOption: Array<SelectableValue<QuerySortOrder>> = [
   { value: 'ASC', description: 'Sort by ascending', icon: 'sort-amount-up' },
   { value: 'DESC', description: 'Sort by descending', icon: 'sort-amount-down' },
 ];
diff --git a/bitmovin-analytics-datasource/src/components/OrderByRow.tsx b/bitmovin-analytics-datasource/src/components/OrderByRow.tsx
index 61d0abd..9067925 100644
--- a/bitmovin-analytics-datasource/src/components/OrderByRow.tsx
+++ b/bitmovin-analytics-datasource/src/components/OrderByRow.tsx
@@ -97,6 +97,7 @@ export function OrderByRow(props: Props) {
     <VerticalGroup>
       {selectedAttributes.map((attribute, index, array) => (
         <OrderByInput
+          key={index}
           isAdAnalytics={props.isAdAnalytics}
           selectableOrderByAttributes={mapOrderBysToSelectableValue()}
           attribute={attribute}