Workaround for bug in socialite
and bug fix in query