diff --git a/app/components/domain/CustomOptionInput/index.tsx b/app/components/domain/CustomOptionInput/index.tsx
index adfaccd..23ce208 100644
--- a/app/components/domain/CustomOptionInput/index.tsx
+++ b/app/components/domain/CustomOptionInput/index.tsx
@@ -157,7 +157,7 @@ function CustomOptionInput(props: Props) {
                             error={error?.description}
                             disabled={disabled}
                             spacing="sm"
-                            placeholder="Provide a brief description for each answer option (e.g. for Yes - The mapped outline does match the building footprint)"
+                            hint="Provide a brief description for each answer option (e.g. for Yes - The mapped outline does match the building footprint)"
                         />
                     </GridLayoutItem>
                 </ListLayout>
diff --git a/app/components/domain/RasterTileServerInput/index.tsx b/app/components/domain/RasterTileServerInput/index.tsx
index 3a77c31..3630d57 100644
--- a/app/components/domain/RasterTileServerInput/index.tsx
+++ b/app/components/domain/RasterTileServerInput/index.tsx
@@ -86,7 +86,10 @@ function RasterTileServerInput(props: Props) {
     const [zoomView, setZoomView] = useState<MapZoomViewType>('aoiBounds');
 
     const workingRasterTileServerNameOptions = useMemo(
-        () => rasterTileServerNameOptions.filter((option) => !option.disabled) ?? [],
+        () => [
+            ...rasterTileServerNameOptions.filter((option) => !option.disabled) ?? [],
+            { type: RasterTileServerNameEnum.Custom, label: 'Custom' },
+        ],
         [rasterTileServerNameOptions],
     );
 
@@ -113,6 +116,7 @@ function RasterTileServerInput(props: Props) {
     );
 
     const { raster: rasterTileServers } = useContext(TileServerContext);
+
     const tileServerMapping = useMemo(() => (
         listToMap(rasterTileServers, ({ type }) => type)
     ), [rasterTileServers]);
diff --git a/app/components/domain/RasterTileServerOutput/index.tsx b/app/components/domain/RasterTileServerOutput/index.tsx
index 8c8ec10..80e6477 100644
--- a/app/components/domain/RasterTileServerOutput/index.tsx
+++ b/app/components/domain/RasterTileServerOutput/index.tsx
@@ -40,7 +40,10 @@ function RasterTileServerOutput(props: Props) {
 
     const rasterTileServerNameMapping = useMemo(
         () => listToMap(
-            rasterTileServers,
+            [
+                ...rasterTileServers,
+                { type: RasterTileServerNameEnum.Custom, label: 'Custom' },
+            ],
             (item) => item.type,
             (item) => item,
         ),
diff --git a/app/views/EditProject/UpdateProjectForm/CompletenessProjectSpecifics/OverlayTileServerPropertyInput/index.tsx b/app/views/EditProject/UpdateProjectForm/CompletenessProjectSpecifics/OverlayTileServerPropertyInput/index.tsx
index 9419578..1184bf2 100644
--- a/app/views/EditProject/UpdateProjectForm/CompletenessProjectSpecifics/OverlayTileServerPropertyInput/index.tsx
+++ b/app/views/EditProject/UpdateProjectForm/CompletenessProjectSpecifics/OverlayTileServerPropertyInput/index.tsx
@@ -116,6 +116,7 @@ function OverlayTileServerPropertyInput(props: Props) {
                 error={error?.type}
                 onChange={handleOverlayLayerTypeChange}
                 disabled={disabled}
+                hint="Select the layer that you want to compare for completeness."
             />
             {value?.type === OverlayLayerTypeEnum.RasterTile && (
                 <OverlayRasterTileConfigInput
diff --git a/backend b/backend
index df87510..d081b0c 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit df8751016d4d6171a6b16ce2984e95c6c16b4b4d
+Subproject commit d081b0cf1264ad94a822ae18d25fba9b7f9a4b00