added -s function to limit search criteria to a string