add query expansion
deal with confilict
add login and register