Remove rule-set from filtering mechanism
Add double quote between words
Merge branch 'develop'