Follow up on #2676
Filter slashes from search hashes.
Merge origin/newframework and fix conflicts
Merge pull request #2691 from bp323/2634FollowUp

Follow up on #2676
Merge pull request #2696 from bp323/XSSFollowup

XSS Follow-up
Merge origin/newframework and fix conflicts