VE-1207: Focus mode adjustments for Category namespace