Query params filtered always; Optimizations; Refactoring and mods