Add missing calls to A-1
Fix regex at start of tampage.js