Refactored likes fetching