Improved workflow, added additional word filters