Improvements to sentiment extraction logic