Slight changes to SearchParser

Still unsure of where to search from though.