[FIX]: fix filters and sorting