Code style fixes.
General improvements to saerching in tables.