better scoring
fix query merging thing, fix query generation