Improved word searching and handling logic to accomodate stop words