IOT-3214 rd mongo query optimalisation - reverify