Fix issue when no results are returned
Fix refresh issue when the data received does not change the number of items