#39 updated indexer to account for null statuses