Q&A, need access to more merge codes

I noticed that in the new Q&A widget, that if a customer does not have a display name setup in their account, that area of the template is left blank, and on that widget we can not use the ##CUSTOMERFIRSTNAME##, etc merge codes.  

If Display Name configured:

If Display Name is not configured:

I would like the ability to have the Q&A author area show something like :

Joshua (Oregon, USA)

Using a merge code setup like:

##IF[QUESTIONAUTHOR]## 

$$QUESTIONAUTHOR$$ (##CUSTOMERSTATE##, ##CUSTOMERCOUNTRY##) 

##ELSE## 

##CUSTOMERFIRSTNAME## (##CUSTOMERSTATE##, ##CUSTOMERCOUNTRY##)

#ENDIF##

Another thing I noticed is that in the Q&A email templates, you can not use the following item merge codes (There may be more, but these are the ones I was trying to use):

##ITEMNAME## 

##ITEMNR##

##ITEMTHUMBNAILURL##

##ITEMPHOTOURL##