Add working filter
Finish table sorting