Fix bugs in metric search and options updates