get_entities: Fix empty entities lists [applied]