flipped order of processing to make sure things work until we get search indices involved