Added check for ADAVersion field in query