Refactored target fetching and improve the look of the top list