add query param & some code clean up