VID-1907 Addressed CR feedback and updated for navigation=true usage