improve query condition
merge