[tr2] Added filters and some changes
[tr]: Minor changes