Fix dirsearch parser to not get confused by logic terms in names and to handle quoted single word names