Updates from @mjangda, better sanitization for the current faire page.