Fix defects navigation