Minor updates to the search parser to beter control the encoding/decoding process