##article.return## Restructuring a Taxonomy of Literary Themes and Motifs for More Efficient Querying