Add generator support for select options (rethink algo)