update handler for wa
Add q alias