Sped of querying of data for api and made default json format more compact