remove semicolon
refactor for global query panel
add global query panel