Simplify logic by changing shape of array on ajax-complete, but leaving the filtering / error-value correcting until it is time to display it.