filtering, optimizations, UI fix