Fix settings non-critical tags