ATLAS-1042 Performance improvement changes for propertykey+typeName based queries (sumasai via shwethags)