Yeah, this is 18 songs, and they did 21 when I saw them. I guess not a massive, massive difference, but I'm just a stickler sometimes. They played a few pretty rad songs when I went: http://www.setlist.fm/setlist/red-ho...-3bd7a880.html
Now that I look at it, 2 of the songs on this setlist are just quick little covers Frusciante would do mid-set during a gear change or something, plus "They're Red Hot," which is super short. So it ends up being the same number of songs, basically.