improve matchOptions