Added support for navigating by comments