[PATCH] Show allowed option values for string matching