fixed same intellij warnings, filter layout improvement