fixing issue with empty schema on initial load