tackling eager loading issues