diff --git a/public/viewjs/products.js b/public/viewjs/products.js
index c6606aa7..82909cb5 100644
--- a/public/viewjs/products.js
+++ b/public/viewjs/products.js
@@ -29,7 +29,7 @@ $("#product-group-filter").on("change", function()
 		value = "";
 	}
 
-	productsTable.column(7).search(value).draw();
+	productsTable.column(6).search(value).draw();
 });
 
 $("#clear-filter-button").on("click", function()
diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js
index 14568977..6f922ade 100644
--- a/public/viewjs/recipes.js
+++ b/public/viewjs/recipes.js
@@ -88,7 +88,7 @@ $("#status-filter").on("change", function()
 	$('.recipe-gallery-item').removeClass('d-none');
 	if (value !== "")
 	{
-		if (value === 'enoughinstock')
+		if (value === 'Xenoughinstock')
 		{
 			$('.recipe-gallery-item').not('.recipe-enoughinstock').addClass('d-none');
 		}
diff --git a/public/viewjs/userfields.js b/public/viewjs/userfields.js
index c15ba679..71a748fb 100644
--- a/public/viewjs/userfields.js
+++ b/public/viewjs/userfields.js
@@ -30,7 +30,7 @@ $("#entity-filter").on("change", function()
 	}
 
 	userfieldsTable.column(1).search(value).draw();
-	$("#new-userfield-button").attr("href", U("/userfield/new?entity=" + value));
+	$("#new-userfield-button").attr("href", U("/userfield/new?embedded&entity=" + value));
 });
 
 $("#clear-filter-button").on("click", function()
@@ -78,8 +78,9 @@ $(document).on('click', '.userfield-delete-button', function(e)
 	});
 });
 
-if (typeof GetUriParam("entity") !== "undefined" && !GetUriParam("entity").isEmpty())
+if (GetUriParam("entity") != undefined && !GetUriParam("entity").isEmpty())
 {
 	$("#entity-filter").val(GetUriParam("entity"));
 	$("#entity-filter").trigger("change");
+	$("#name").focus();
 }
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index dc43fc84..328c623f 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -59,7 +59,7 @@
 					<select class="form-control"
 						id="status-filter">
 						<option value="all">{{ $__t('All') }}</option>
-						<option value="enoughinstock">{{ $__t('Enough in stock') }}</option>
+						<option value="Xenoughinstock">{{ $__t('Enough in stock') }}</option>
 						<option value="enoughinstockwithshoppinglist">{{ $__t('Not enough in stock, but already on the shopping list') }}</option>
 						<option value="notenoughinstock">{{ $__t('Not enough in stock') }}</option>
 					</select>
@@ -153,7 +153,7 @@
 								{{ FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count }}
 							</td>
 							<td class="d-none">
-								@if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) enoughinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) enoughinstockwithshoppinglist @else notenoughinstock @endif
+								@if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) Xenoughinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) enoughinstockwithshoppinglist @else notenoughinstock @endif
 							</td>
 							<td class="d-none">
 								@foreach(FindAllObjectsInArrayByPropertyValue($recipePositionsResolved, 'recipe_id', $recipe->id) as $recipePos)
diff --git a/views/userfields.blade.php b/views/userfields.blade.php
index 54d71f91..a1442a87 100644
--- a/views/userfields.blade.php
+++ b/views/userfields.blade.php
@@ -25,7 +25,8 @@
 			</div>
 			<div class="related-links collapse d-md-flex order-2 width-xs-sm-100 m-1 mt-md-0 mb-md-0 float-right"
 				id="related-links">
-				<a class="btn btn-primary responsive-button show-as-dialog-link"
+				<a id="new-userfield-button"
+					class="btn btn-primary responsive-button show-as-dialog-link"
 					href="{{ $U('/userfield/new?embedded') }}">
 					{{ $__t('Add') }}
 				</a>