Did optimizations and fixed some issues related to filter
configurations.