Issue #141: Correcting state table select statements.