remove hack for empty entity

use suggestion api for empty objects