config adapt
bugfix
optimized matching