Bug fixes for Aq forms along with PHI data, On behalf of Ibrahim