Refactor some codes
Merge branch 'refactor'
Divide session_id from query