Fixes for infinite scroll and default sorting