[BUGFIX] Fixes issue with limits and offsets not working properly