Cleaned up the search parser.