RESTWS-310: Fixed subhandlers support