Hi Anon I would use "had done" rather than "has done". The past perfect works better in combination with "may have wanted". The word "that" is optional, but I think I would use it.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.