Return good data
Fix rendering of full data
Updated sample data to use same format as actual data