Improved keyword matching. Stanza grouping.