Tag navigator bug fix