fix: use option values instead of option value IDs