use friendly ids and show company data for real
merge with remote