I believe that at some point, during later generations (when the number of Pokémon rises to ridiculous levels), the WHOLE Pokédex should be revamped. Kind of start over, in a way. Make a new national dex. Because honestly, it's easier now, but when there's five or six or seven generations, searching for evolutions between the first and fourth, or (just for expample) the second and seventh, things would just get crazy.