WebUI-2014: additional changes