Add html tags filter to input data
Merge remote-tracking branch 'origin/dev' into dev
Few changes