Enhanced server listing API (now more efficient) and fixed count issues.