diff --git a/src/blackgui/filters/aircrafticaofilterbar.cpp b/src/blackgui/filters/aircrafticaofilterbar.cpp
index d7a5222f6..231ef25a4 100644
--- a/src/blackgui/filters/aircrafticaofilterbar.cpp
+++ b/src/blackgui/filters/aircrafticaofilterbar.cpp
@@ -8,9 +8,11 @@
  */
 
 #include "aircrafticaofilterbar.h"
+#include "blackgui/uppercasevalidator.h"
 #include "ui_aircrafticaofilterbar.h"
 
 using namespace BlackMisc::Aviation;
+using namespace BlackGui;
 using namespace BlackGui::Models;
 
 namespace BlackGui
@@ -26,6 +28,10 @@ namespace BlackGui
             connect(ui->le_Designator, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
             connect(ui->le_Manufacturer, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
             connect(ui->le_Description, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
+
+            CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
+            this->ui->le_Designator->setValidator(ucv);
+            this->ui->le_Manufacturer->setValidator(ucv);
         }
 
         CAircraftIcaoFilterBar::~CAircraftIcaoFilterBar()
diff --git a/src/blackgui/filters/aircrafticaofilterbar.ui b/src/blackgui/filters/aircrafticaofilterbar.ui
index 0a6b00715..be0289197 100644
--- a/src/blackgui/filters/aircrafticaofilterbar.ui
+++ b/src/blackgui/filters/aircrafticaofilterbar.ui
@@ -83,7 +83,7 @@
       </size>
      </property>
      <property name="maxLength">
-      <number>4</number>
+      <number>6</number>
      </property>
      <property name="placeholderText">
       <string>ICAO</string>
@@ -115,7 +115,11 @@
     </widget>
    </item>
    <item row="0" column="6">
-    <widget class="QLineEdit" name="le_Description"/>
+    <widget class="QLineEdit" name="le_Description">
+     <property name="placeholderText">
+      <string>Descriptive text</string>
+     </property>
+    </widget>
    </item>
    <item row="1" column="0" colspan="5">
     <widget class="BlackGui::CAircraftCombinedTypeSelector" name="combinedtype_Selector">
diff --git a/src/blackgui/filters/aircraftmodelfilterbar.cpp b/src/blackgui/filters/aircraftmodelfilterbar.cpp
index eabec6e4e..63ecd8fad 100644
--- a/src/blackgui/filters/aircraftmodelfilterbar.cpp
+++ b/src/blackgui/filters/aircraftmodelfilterbar.cpp
@@ -9,7 +9,9 @@
 
 #include "aircraftmodelfilterbar.h"
 #include "ui_aircraftmodelfilterbar.h"
+#include "blackgui/uppercasevalidator.h"
 
+using namespace BlackGui;
 using namespace BlackGui::Models;
 
 namespace BlackGui
@@ -30,6 +32,12 @@ namespace BlackGui
             connect(ui->le_LiveryCode, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
             connect(ui->le_ModelDescription, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
             connect(ui->le_ModelKey, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
+
+            CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
+            this->ui->le_AircraftIcao->setValidator(ucv);
+            this->ui->le_AirlineIcao->setValidator(ucv);
+            this->ui->le_ModelKey->setValidator(ucv);
+            this->ui->le_AircraftManufacturer->setValidator(ucv);
         }
 
         CAircraftModelFilterBar::~CAircraftModelFilterBar()
diff --git a/src/blackgui/filters/countryfilterbar.cpp b/src/blackgui/filters/countryfilterbar.cpp
index eb004f815..9f7503199 100644
--- a/src/blackgui/filters/countryfilterbar.cpp
+++ b/src/blackgui/filters/countryfilterbar.cpp
@@ -1,6 +1,17 @@
+/* Copyright (C) 2015
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
 #include "countryfilterbar.h"
 #include "ui_countryfilterbar.h"
+#include "blackgui/uppercasevalidator.h"
 
+using namespace BlackGui;
 using namespace BlackGui::Models;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
@@ -17,6 +28,9 @@ namespace BlackGui
             this->setButtonsAndCount(this->ui->filter_Buttons);
             connect(ui->le_IsoCode, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
             connect(ui->le_Name, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
+
+            CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
+            this->ui->le_IsoCode->setValidator(ucv);
         }
 
         CCountryFilterBar::~CCountryFilterBar()
@@ -46,5 +60,5 @@ namespace BlackGui
             ui->le_IsoCode->clear();
             ui->le_Name->clear();
         }
-    }
-}
+    } // ns
+} // ns
diff --git a/src/blackgui/filters/countryfilterbar.h b/src/blackgui/filters/countryfilterbar.h
index 4fbe48d80..005f3100f 100644
--- a/src/blackgui/filters/countryfilterbar.h
+++ b/src/blackgui/filters/countryfilterbar.h
@@ -1,3 +1,14 @@
+/* Copyright (C) 2015
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
 #ifndef BLACKGUI_FILTERS_COUNTRYFILTERBAR_H
 #define BLACKGUI_FILTERS_COUNTRYFILTERBAR_H
 
diff --git a/src/blackgui/filters/filterbarbuttons.ui b/src/blackgui/filters/filterbarbuttons.ui
index 2eaa675c8..48faa6279 100644
--- a/src/blackgui/filters/filterbarbuttons.ui
+++ b/src/blackgui/filters/filterbarbuttons.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>140</width>
-    <height>24</height>
+    <height>25</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -69,23 +69,7 @@
      </property>
     </widget>
    </item>
-   <item>
-    <spacer name="hs_FilterBarButtons">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>10</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
+   <item alignment="Qt::AlignLeft">
     <widget class="QToolButton" name="tb_Filter">
      <property name="toolTip">
       <string>filter</string>
@@ -113,7 +97,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignLeft">
     <widget class="QToolButton" name="tb_ClearForm">
      <property name="toolTip">
       <string>clear form</string>
@@ -130,6 +114,22 @@
      </property>
     </widget>
    </item>
+   <item>
+    <spacer name="hs_FilterBarButtons">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>10</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources>