query fix
Merge branch 'hot_fix_for_upload_avatar' into staging