Made SFW enhancement work on all pages.