Make it work for the web interface as well with gsub