refactored navigator to use link queries