Cleaned comments
Implementing filter and sorting directly in model query