-fixed lack of data on initial load