Updates to the search parser