Fixing up response from index