Don't return non-primary table headers

As they are 1:M.  Do use them for query criteria though.
Remove empty categories from col selector