Handle dynamic values for count
Expand stream to correctly poll/limit/sort