only set query when ?
remove un-neeeded line
merge remote