diff --git a/launcher/textures_scanner.cpp b/launcher/textures_scanner.cpp
index ef91c4b0..be2d0a0a 100644
--- a/launcher/textures_scanner.cpp
+++ b/launcher/textures_scanner.cpp
@@ -168,8 +168,8 @@ std::shared_ptr<ui::skin_meta> ui::vehicles_bank::parse_meta(const std::string &
 	meta->photo_author = win1250_to_utf8(meta->photo_author);
 
 	meta->search_lowered +=
-	        ToLower("name:" + meta->name + ",id:" + meta->short_id + ",depot:" + meta->location +
-	                ",revdate:" + meta->rev_date + ",revcompany:" + meta->rev_company + ",texture:" + meta->texture_author + ",photo:" + meta->photo_author);
+	        ToLower("n:" + meta->name + "i:" + meta->short_id + "d:" + meta->location +
+	                "r:" + meta->rev_date + "c:" + meta->rev_company + "t:" + meta->texture_author + "p:" + meta->photo_author);
 
 	std::replace(std::begin(meta->location), std::end(meta->location), '_', ' ');
 	std::replace(std::begin(meta->rev_company), std::end(meta->rev_company), '_', ' ');
diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp
index 0a226c2a..4ab5503a 100644
--- a/launcher/vehicle_picker.cpp
+++ b/launcher/vehicle_picker.cpp
@@ -255,8 +255,7 @@ bool ui::vehiclepicker_panel::skin_filter(const skin_set *skin, std::vector<sear
 		if (term.mode == search_info::TEXT) {
 			if (skin->skin.find(term.text) != -1)
 				found = true;
-
-			if (skin->meta && skin->meta->search_lowered.find(term.text) != -1)
+			else if (skin->meta && skin->meta->search_lowered.find(term.text) != -1)
 				found = true;
 		} else if (skin->meta && skin->meta->rev_year != -1) {
 			if (term.mode == search_info::YEAR_MIN) {