Add optional_value

Fix match with '-' prefixed string.
Add more optios of ls