Refactor updating answer store so more reliable across many submissions