Fix entities, fix case when empty data is coming