Slight changes to NKTable
First step towards a query analyzer