SONATA-215 - Updated query