Added table sorting and searching