diff --git a/.gitignore b/.gitignore
index 4779056d..f0334d6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ cmake_install.cmake
 *automoc.cpp
 .cmake/
 cmake-build-*/
+build/
 
 # Ninja
 *.ninja
diff --git a/src/ui/event/event_dialog.ui b/src/ui/event/event_dialog.ui
index d7b5b0d4..d4e683e5 100644
--- a/src/ui/event/event_dialog.ui
+++ b/src/ui/event/event_dialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>802</width>
+    <width>1252</width>
     <height>670</height>
    </rect>
   </property>
diff --git a/src/ui/map/map_scene.cpp b/src/ui/map/map_scene.cpp
index d8821edc..91654dc2 100644
--- a/src/ui/map/map_scene.cpp
+++ b/src/ui/map/map_scene.cpp
@@ -164,6 +164,7 @@ void MapScene::Init()
 			SLOT(onLayerChanged()));
 	m_view->verticalScrollBar()->setValue(n_mapInfo.scrollbar_y *static_cast<int>(m_scale));
 	m_view->horizontalScrollBar()->setValue(n_mapInfo.scrollbar_x * static_cast<int>(m_scale));
+	core().setCurrentMapEvents(mapEvents());
 	m_init = true;
 	redrawMap();
 }
@@ -265,7 +266,6 @@ void MapScene::redrawMap()
 	if (!m_init)
 		return;
 	core().LoadChipset(m_map->chipset_id);
-	core().setCurrentMapEvents(mapEvents());
 	s_tileSize = core().tileSize() * static_cast<double>(m_scale);
 	redrawLayer(Core::LOWER);
 	redrawLayer(Core::UPPER);
diff --git a/src/ui/other/search_dialog.cpp b/src/ui/other/search_dialog.cpp
index 9190e929..c254bd7f 100644
--- a/src/ui/other/search_dialog.cpp
+++ b/src/ui/other/search_dialog.cpp
@@ -122,7 +122,7 @@ void SearchDialog::on_button_search_clicked()
 
 	if (ui->radio_variable->isChecked())
 	{
-		int varID = ui->combo_variable->currentData().toInt();
+		int varID = ui->combo_variable->currentText().toInt();
 
 		search_predicate = [varID](const lcf::rpg::EventCommand& com)
 		{
@@ -184,7 +184,7 @@ void SearchDialog::on_button_search_clicked()
 	}
 	else if (ui->radio_switch->isChecked())
 	{
-		int switchID = ui->combo_switch->currentData().toInt();
+		int switchID = ui->combo_switch->currentText().toInt();
 
 		search_predicate = [switchID](const lcf::rpg::EventCommand& com)
 		{
@@ -202,7 +202,7 @@ void SearchDialog::on_button_search_clicked()
 	}
 	else if (ui->radio_item->isChecked())
 	{
-		int itemID = ui->combo_item->currentData().toInt();
+		int itemID = ui->combo_item->currentText().toInt();
 
 		search_predicate = [itemID](const lcf::rpg::EventCommand& com)
 		{