Move list/key checks to onStatementAdded()