Fixed tooltip + refactored dataFactory to be reliable