Eliminate weird if construct that still adds all fields to the tablemanage grid
Simplify some more field selection criteria