Fixed SW?State not being included in WEB