WEBSPARK-131, WEBSPARK-115: Fixing thematic issues