vchethan|#2217| Adding filtering and sorting capability