Adding support for window option in select