query condition adjust
ready for test
merge