Wording Filter changes in Step 3
Test fixes