When fixing counts, add STI type condition only to STI tables.

Closes #72, #73