AFAICS, fetch first can't be used with for update. As we don't know if we have a for update when defining the limit, we can't really use it unfortunately.

If you keep the old limit handler, does it work?