made filter and sort by