Fix issue with it only loading the last 20 records