Fixed table sort on Search, added columns, refactored other htm