[RFC] CARA-1734

Adjusted the query