[RFC] CARA-1374

Adjusted the query