It now takes company from database to make navigation reliable