LPS-44142 Properly ordering update and query to avoid version conflict
LPS-44142 SF