diff --git a/PokemonGoIV/1Dialog.vb b/PokemonGoIV/1Dialog.vb
index 43f36b7..082508e 100644
--- a/PokemonGoIV/1Dialog.vb
+++ b/PokemonGoIV/1Dialog.vb
@@ -18,7 +18,9 @@
 Option Explicit
 
 ' Remembers the selected Pokémon for the next run.
-Global sSelected As String
+Global sLastSelected As String
+' Remembers the selected player level for the next run.
+Global sLastLevel As Integer
 
 ' The parameters to find the individual values.
 Type aFindIVParam
@@ -72,15 +74,18 @@ Function fnAskParam As aFindIVParam
 		"ImageURL", fnGetImageUrl ("Unknown"))
 	
 	' Remembers the previously-selected Pokémon.
-	oDialog.getControl ("lstPokemon").selectItem (sSelected, True)
+	oDialog.getControl ("lstPokemon").selectItem (sLastSelected, True)
+	oDialog.getControl ("lstPlayerLevel").selectItem (sLastLevel, True)
 	
 	If oDialog.execute = 0 Then
 		aQuery.bIsCancelled = True
+	    sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem
 		fnAskParam = aQuery
 		Exit Function
 	End If
 	
 	subReadBaseStats
+	sLastLevel = oDialog.getControl ("lstPlayerLevel").getSelectedItem
 	nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos
 	With aQuery
 		.sPokemonId = maBaseStats (nSelected).sPokemonId
@@ -175,9 +180,9 @@ Sub subLstPokemonSelected (oEvent As object)
 	oDialog = oEvent.Source.getContext
 	
 	' Checks which Pokémon was selected.
-	sSelected = oDialog.getControl ("lstPokemon").getSelectedItem
+	sLastSelected = oDialog.getControl ("lstPokemon").getSelectedItem
 	nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos
-	' This happens at the beginning where sSelected is "".
+	' This happens at the beginning where sLastSelected is "".
 	If nSelected = -1 Then
 		Exit Sub
 	End If
diff --git a/PokemonGoIV/2Report.vb b/PokemonGoIV/2Report.vb
index ffe27c8..1499f4e 100644
--- a/PokemonGoIV/2Report.vb
+++ b/PokemonGoIV/2Report.vb
@@ -100,7 +100,7 @@ Sub subCreateReport ( _
 	End If
 	
 	If aQuery.nPlayerLevel <> 0 Then
-		fMaxLevel = aQuery.nPlayerLevel + 1.5
+		fMaxLevel = aQuery.nPlayerLevel + 2
 		If fMaxLevel > 40 Then
 			fMaxLevel = 40
 		End If
diff --git a/oxt/PokemonGoIV/1Dialog.xba b/oxt/PokemonGoIV/1Dialog.xba
index 353f6f3..1b2f3cf 100644
--- a/oxt/PokemonGoIV/1Dialog.xba
+++ b/oxt/PokemonGoIV/1Dialog.xba
@@ -20,7 +20,9 @@
 Option Explicit
 
 &apos; Remembers the selected Pokémon for the next run.
-Global sSelected As String
+Global sLastSelected As String
+&apos; Remembers the selected player level for the next run.
+Global sLastLevel As Integer
 
 &apos; The parameters to find the individual values.
 Type aFindIVParam
@@ -74,15 +76,18 @@ Function fnAskParam As aFindIVParam
 		&quot;ImageURL&quot;, fnGetImageUrl (&quot;Unknown&quot;))
 	
 	&apos; Remembers the previously-selected Pokémon.
-	oDialog.getControl (&quot;lstPokemon&quot;).selectItem (sSelected, True)
+	oDialog.getControl (&quot;lstPokemon&quot;).selectItem (sLastSelected, True)
+	oDialog.getControl (&quot;lstPlayerLevel&quot;).selectItem (sLastLevel, True)
 	
 	If oDialog.execute = 0 Then
 		aQuery.bIsCancelled = True
+	    sLastLevel = oDialog.getControl (&quot;lstPlayerLevel&quot;).getSelectedItem
 		fnAskParam = aQuery
 		Exit Function
 	End If
 	
 	subReadBaseStats
+	sLastLevel = oDialog.getControl (&quot;lstPlayerLevel&quot;).getSelectedItem
 	nSelected = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItemPos
 	With aQuery
 		.sPokemonId = maBaseStats (nSelected).sPokemonId
@@ -177,9 +182,9 @@ Sub subLstPokemonSelected (oEvent As object)
 	oDialog = oEvent.Source.getContext
 	
 	&apos; Checks which Pokémon was selected.
-	sSelected = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItem
+	sLastSelected = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItem
 	nSelected = oDialog.getControl (&quot;lstPokemon&quot;).getSelectedItemPos
-	&apos; This happens at the beginning where sSelected is &quot;&quot;.
+	&apos; This happens at the beginning where sLastSelected is &quot;&quot;.
 	If nSelected = -1 Then
 		Exit Sub
 	End If
diff --git a/oxt/PokemonGoIV/2Report.xba b/oxt/PokemonGoIV/2Report.xba
index 8873d63..3840618 100644
--- a/oxt/PokemonGoIV/2Report.xba
+++ b/oxt/PokemonGoIV/2Report.xba
@@ -102,7 +102,7 @@ Sub subCreateReport ( _
 	End If
 	
 	If aQuery.nPlayerLevel &lt;&gt; 0 Then
-		fMaxLevel = aQuery.nPlayerLevel + 1.5
+		fMaxLevel = aQuery.nPlayerLevel + 2
 		If fMaxLevel &gt; 40 Then
 			fMaxLevel = 40
 		End If