diff --git a/src/bnhtrade.Core/Data/Database/Repository/Implementation/StockJournalRepository.cs b/src/bnhtrade.Core/Data/Database/Repository/Implementation/StockJournalRepository.cs
index 065ab10..632437c 100644
--- a/src/bnhtrade.Core/Data/Database/Repository/Implementation/StockJournalRepository.cs
+++ b/src/bnhtrade.Core/Data/Database/Repository/Implementation/StockJournalRepository.cs
@@ -105,7 +105,7 @@ namespace bnhtrade.Core.Data.Database.Repository.Implementation
             string lockClause = "";
             if (lockRecords)
             {
-                lockClause = " WITH (UPDLOCK, HOLDLOCK)";
+                lockClause = "WITH (UPDLOCK, HOLDLOCK)";
             }
 
             string sql = $@"
@@ -121,9 +121,9 @@ namespace bnhtrade.Core.Data.Database.Repository.Implementation
                        tblStockJournalPost.StockJournalPostID,
                        tblStockJournalPost.StockStatusID,
                        tblStockJournalPost.Quantity,
-                FROM   tblStockJournal{lockClause}
-                       LEFT OUTER JOIN tblStock{lockClause} ON tblStockJournal.StockID = tblStock.StockID
-                       LEFT OUTER JOIN tblStockJournalPost{lockClause} ON tblStockJournal.StockJournalID = tblStockJournalPost.StockJournalID
+                FROM   tblStockJournal {lockClause}
+                       LEFT OUTER JOIN tblStock {lockClause} ON tblStockJournal.StockID = tblStock.StockID
+                       LEFT OUTER JOIN tblStockJournalPost {lockClause} ON tblStockJournal.StockJournalID = tblStockJournalPost.StockJournalID
                 WHERE  1=1 ";
 
             // build where clause based on provided filters
@@ -156,8 +156,12 @@ namespace bnhtrade.Core.Data.Database.Repository.Implementation
             }
             if (stockStatusIds != null && stockStatusIds.Any())
             {
-                sql = sql + Environment.NewLine + " AND tblStockJournal.StockJournalID IN (SELECT StockJournalID FROM tblStockJournalPost WHERE "
-                    + sqlWhere.InClause("StockStatusID", stockStatusIds) + " ) ";
+                sql += sqlWhere.InClause(
+                        "StockStatusID"
+                        , stockStatusIds
+                        , " AND tblStockJournal.StockJournalID IN (SELECT StockJournalID FROM tblStockJournalPost WHERE "
+                        , " ) "
+                        );
                 noFilter = false;
             }
             if (noFilter)