Remove reliance on .Value in Concepts for a couple of queries