SECURITY: Fix handling of CommentStore and insertSelect