Working on a fix for :query key as string