fix twitter filter for @ and #
Merge branch 'fix-alert' into develop