diff --git a/sevenkeys/cli/stashui.go b/sevenkeys/cli/stashui.go
index ff6ba13..6046fca 100644
--- a/sevenkeys/cli/stashui.go
+++ b/sevenkeys/cli/stashui.go
@@ -15,13 +15,19 @@ var (
 	source          string
 	cardCondition   string
 
+	searchCriteria logic.SearchCriteria = logic.SearchCriteria{
+		SetCode:  "",
+		Foil:     logic.Either,
+		Promo:    logic.Either,
+		Language: "en",
+	}
 	searchOptions logic.SearchOptions
 )
 
 func getSearchOptions(db *sql.DB) {
 	if searchOptions == nil {
 		fmt.Println("LOADING")
-		options, err := logic.GetAllSearchOptions(db)
+		options, err := logic.GetAllSearchOptions(db, searchCriteria)
 		logic.Check(err)
 		searchOptions = options
 		fmt.Println("READY")
@@ -61,7 +67,7 @@ func InsertSelectedCard(db *sql.DB) {
 		return
 	}
 
-	if storageBoxLabel == "" {
+	if storageBoxLabel == "" || cardCondition == "" {
 		GetStorageOptions()
 	}