Fix entity lookup data validator
Return more entity-like data structure.