Add search and pagination options