Enhance tooltip content display
Refactored queries to allow only a part of data to be queried without fail