added query cookie
Merge remote-tracking branch 'origin/imac'