Added auto select of SQL.NULL in Query.
Moved key columns first in tables.