diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
index 492202b1c..f6c2a4477 100644
--- a/client/lcd/lcd_test.go
+++ b/client/lcd/lcd_test.go
@@ -405,11 +405,11 @@ func TestTxs(t *testing.T) {
 	require.Equal(t, emptyTxs, txs)
 
 	// query empty
-	txs = getTransactions(t, port, fmt.Sprintf("sender_bech32=%s", addr.String()))
+	txs = getTransactions(t, port, fmt.Sprintf("sender=%s", addr.String()))
 	require.Equal(t, emptyTxs, txs)
 
 	// also tests url decoding
-	txs = getTransactions(t, port, fmt.Sprintf("sender_bech32=%s", addr.String()))
+	txs = getTransactions(t, port, fmt.Sprintf("sender=%s", addr.String()))
 	require.Equal(t, emptyTxs, txs)
 
 	txs = getTransactions(t, port, fmt.Sprintf("action=submit%%20proposal&proposer=%s", addr.String()))
@@ -425,12 +425,12 @@ func TestTxs(t *testing.T) {
 	require.Equal(t, resultTx.Hash, txs[0].Hash)
 
 	// query sender
-	txs = getTransactions(t, port, fmt.Sprintf("sender_bech32=%s", addr.String()))
+	txs = getTransactions(t, port, fmt.Sprintf("sender=%s", addr.String()))
 	require.Len(t, txs, 1)
 	require.Equal(t, resultTx.Height, txs[0].Height)
 
 	// query recipient
-	txs = getTransactions(t, port, fmt.Sprintf("recipient_bech32=%s", receiveAddr.String()))
+	txs = getTransactions(t, port, fmt.Sprintf("recipient=%s", receiveAddr.String()))
 	require.Len(t, txs, 1)
 	require.Equal(t, resultTx.Height, txs[0].Height)
 }
diff --git a/client/tx/search.go b/client/tx/search.go
index 96cd161d2..158dafa72 100644
--- a/client/tx/search.go
+++ b/client/tx/search.go
@@ -50,17 +50,11 @@ $ gaiacli query txs --tags <tag1>:<value1>&<tag2>:<value2>
 					return fmt.Errorf("%s should be of the format <key>:<value>", tagsStr)
 				}
 				keyValue := strings.Split(tag, ":")
-				key, value, errMsg := getKeyFromBechPrefix(keyValue[0], keyValue[1])
-				if errMsg != "" {
-					return errors.New(errMsg)
-				}
-
-				tag = fmt.Sprintf("%s='%s'", key, value)
+				tag = fmt.Sprintf("%s='%s'", keyValue[0], keyValue[1])
 				tmTags = append(tmTags, tag)
 			}
 
 			cliCtx := context.NewCLIContext().WithCodec(cdc)
-
 			txs, err := searchTxs(cliCtx, cdc, tmTags)
 			if err != nil {
 				return err
@@ -133,28 +127,6 @@ func searchTxs(cliCtx context.CLIContext, cdc *codec.Codec, tags []string) ([]In
 	return info, nil
 }
 
-func getKeyFromBechPrefix(key string, value string) (string, string, string) {
-	if strings.HasSuffix(key, "_bech32") {
-		prefix := strings.Split(value, "1")[0]
-		bz, err := sdk.GetFromBech32(value, prefix)
-		if err != nil {
-			return "", "", err.Error()
-		}
-
-		switch prefix {
-		case sdk.Bech32PrefixAccAddr:
-			value = sdk.AccAddress(bz).String()
-		case sdk.Bech32PrefixValAddr:
-			value = sdk.ValAddress(bz).String()
-		default:
-			return "", "", sdk.ErrInvalidAddress(fmt.Sprintf("invalid bech32 prefix '%s'", prefix)).Error()
-		}
-		key = strings.TrimRight(key, "_bech32")
-	}
-	return key, value, ""
-
-}
-
 // parse the indexed txs into an array of Info
 func FormatTxResults(cdc *codec.Codec, res []*ctypes.ResultTx) ([]Info, error) {
 	var err error
@@ -193,11 +165,6 @@ func SearchTxRequestHandlerFn(cliCtx context.CLIContext, cdc *codec.Codec) http.
 				return
 			}
 
-			key, value, errMsg := getKeyFromBechPrefix(key, value)
-			if errMsg != "" {
-				utils.WriteErrorResponse(w, http.StatusBadRequest, errMsg)
-				return
-			}
 			tag := fmt.Sprintf("%s='%s'", key, value)
 			tags = append(tags, tag)
 		}