Refactoring query match

Set version 1.3.3