updated some comments
require query match
rewrite dispariaging comment
more graceful match handling