Commit for new onOptionsLoad filter function (Revert point)