Fix for custom values on tooltip
Change tooltip behavior
Fix for custom values on tooltip