[Fix] In-progress fixes for Options feature