added throttler and fixed sorting