simplify by always doing search
fix pagination