Tweaks for adding label to additional match
Fix up query builder
Fix up has to use where