I had many clients that should've been able to claim the energy credit for 2018 but couldn't because at the time the credit had expired - therefore - the Form5695 wasn't completed.    How did you complete the Form 5695 BEFORE the extender was past?    I can't recall for sure but wouldn't it have given you an error for e-filing?    My point is the query can't work if the info isn't there.

I made myself a nice list with a word document of those that would be eligible for amending if it was extended.