fixed same intellij warnings, filter layout improvement
Merge remote-tracking branch 'origin/master'