Merge "Added param requestId to query 1 row"