Build with new header rows in auto complete tables