Fix #66. Remove unnecessary event listener. Add default value for match fields