diff --git a/op/op.Settings.php b/op/op.Settings.php
index 1a7a58e19..a38e71fa1 100644
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@@ -74,7 +74,7 @@ if ($action == "saveSettings")
   $settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]);
   $settings->_fullSearchEngine = $_POST["fullSearchEngine"];
   $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
-  $settings->_showSingleSearchHit = $_POST["showSingleSearchHit"];
+  $settings->_showSingleSearchHit = getBoolValue("showSingleSearchHit");
   $settings->_enableClipboard = getBoolValue("enableClipboard");
   $settings->_enableDropUpload = getBoolValue("enableDropUpload");
   $settings->_enableFolderTree = getBoolValue("enableFolderTree");
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 5ef23523a..25742ae84 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -76,7 +76,7 @@ $(document).ready( function() {
     <div class="accordion" id="accordion1">
       <div class="accordion-group">
         <div class="accordion-heading">
-          <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1"       href="#collapseOne">
+          <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseOne">
 						<?php printMLText('attribute_value'); ?>
           </a>
         </div>
@@ -89,9 +89,20 @@ $(document).ready( function() {
 					print "<thead>\n<tr>\n";
 					print "<th>".getMLText("attribute_value")."</th>\n";
 					print "<th>".getMLText("attribute_count")."</th>\n";
+					print "<th></th>\n";
 					print "</tr></thead>\n<tbody>\n";
 					foreach($res['frequencies'][$type] as $entry) {
-						echo "<tr><td>".$entry['value']."</td><td>".$entry['c']."</td></tr>";
+						echo "<tr>";
+						echo "<td>".$entry['value']."</td><td>".$entry['c']."</td>";
+						/* various checks, if the value is valid */
+						echo "<td>";
+						/* Check if value is in value set */
+						if($selattrdef->getValueSet()) {
+							if(in_array($entry['value'], $selattrdef->getValueSetAsArray()))
+								printMLText("attribute_value_not_in_valueset");
+						}
+						echo "</td>";
+						echo "</tr>";
 					}
 					print "</tbody></table>";
 				}