Cleaned the code
Escape check
Uppercase for the virtual sensor name
Feedback on saving