Fixes Bug with limit and offset

Fixes Bug with limit and offset that resulted in broken component from 2.3.5 onward (still working for 2.3.1 to 2.3.4) - now works for 2.3.1, 2.3.4, 2.3.5 and 2.4.2 (tested only theses)