Fixes and updates for option.beforeId