Formatting and list hook fix

ui/v2.5/src/components/List/AddFilter.tsx

@@ -190,7 +190,7 @@ export const AddFilter: React.FC<IAddFilterProps> = (
           type={criterion.inputType}
           onChange={onChangedInput}
           onBlur={onBlurInput}
-          defaultValue={criterion.value ? criterion.value.toString() : ''}
+          defaultValue={criterion.value ? criterion.value.toString() : ""}
         />
       );
     }

ui/v2.5/src/components/Scenes/SceneListTable.tsx

@@ -21,10 +21,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
 
   const renderPerformers = (performers: Partial<GQL.Performer>[]) =>
     performers.map(performer => (
-      <Link
+      <Link key={performer.id} to={NavUtils.makePerformerScenesUrl(performer)}>
-        key={performer.id}
-        to={NavUtils.makePerformerScenesUrl(performer)}
-      >
         <h6>{performer.name}</h6>
       </Link>
     ));

ui/v2.5/src/hooks/ListHook.tsx

@@ -342,6 +342,25 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
       })
     : undefined;
 
+  function maybeRenderContent() {
+    if (!result.loading && !result.error) {
+      return options.renderContent(result, filter, selectedIds, zoomIndex);
+    }
+  }
+
+  function maybeRenderPagination() {
+    if (!result.loading && !result.error) {
+      return (
+        <Pagination
+          itemsPerPage={filter.itemsPerPage}
+          currentPage={filter.currentPage}
+          totalItems={totalCount}
+          onChangePage={onChangePage}
+        />
+      );
+    }
+  }
+
   const template = (
     <div>
       <ListFilter
@@ -362,15 +381,10 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
       {options.renderSelectedOptions && selectedIds.size > 0
         ? options.renderSelectedOptions(result, selectedIds)
         : undefined}
-      {options.renderContent(result, filter, selectedIds, zoomIndex)}
       {(result.loading || !forageInitialised) && <LoadingIndicator />}
       {result.error && <h1>{result.error.message}</h1>}
-      <Pagination
+      {maybeRenderContent()}
-        itemsPerPage={filter.itemsPerPage}
+      {maybeRenderPagination()}
-        currentPage={filter.currentPage}
-        totalItems={totalCount}
-        onChangePage={onChangePage}
-      />
     </div>
   );