replace some draw area by draw stack
remove useless naming in query
initial commit