NoSQL Expression fix