Entity query

Maybe extend EntityHeader to include more info (to reduce calls)