AQ- Show extension form names in add filter panel, and other minor fixes