The kanji 綺

I have been using Henshall's book as my kanji reference. I have come across the kanji 綺 (aya/ki, meaning beautiful) and it's not in Henshall, presumably because Henshall covers only Joyo kanjis where this is jinmeiyo.

Please can anyone suggest a single-volume book that covers all jinmeiyo kanjis as well as joyo?

Thanks.