diff --git a/backend/pkg/db/postgres/messages-web-stats.go b/backend/pkg/db/postgres/messages-web-stats.go
index 933442b0b..27a6272e2 100644
--- a/backend/pkg/db/postgres/messages-web-stats.go
+++ b/backend/pkg/db/postgres/messages-web-stats.go
@@ -35,7 +35,7 @@ func (conn *Conn) InsertWebStatsPerformance(sessionID uint64, p *PerformanceTrac
 }
 
 func (conn *Conn) InsertWebStatsResourceEvent(sessionID uint64, e *ResourceEvent) error {
-	host, _, err := url.GetURLParts(e.URL)
+	host, _, _, err := url.GetURLParts(e.URL)
 	if err != nil {
 		return err
 	}
diff --git a/backend/pkg/db/postgres/messages-web.go b/backend/pkg/db/postgres/messages-web.go
index 0d822cddd..ff7352594 100644
--- a/backend/pkg/db/postgres/messages-web.go
+++ b/backend/pkg/db/postgres/messages-web.go
@@ -55,7 +55,7 @@ func (conn *Conn) InsertWebUserAnonymousID(sessionID uint64, userAnonymousID *Us
 
 // TODO: fix column "dom_content_loaded_event_end" of relation "pages"
 func (conn *Conn) InsertWebPageEvent(sessionID uint64, e *PageEvent) error {
-	host, path, err := url.GetURLParts(e.URL)
+	host, path, query, err := url.GetURLParts(e.URL)
 	if err != nil {
 		return err
 	}
@@ -64,20 +64,27 @@ func (conn *Conn) InsertWebPageEvent(sessionID uint64, e *PageEvent) error {
 		return err
 	}
 	defer tx.rollback()
+	// base_path is depricated
 	if err := tx.exec(`
 		INSERT INTO events.pages (
-			session_id, message_id, timestamp, referrer, base_referrer, host, path, base_path,
+			session_id, message_id, timestamp, referrer, base_referrer, host, path, query,
 			dom_content_loaded_time, load_time, response_end, first_paint_time, first_contentful_paint_time, 
 			speed_index, visually_complete, time_to_interactive,
-			response_time, dom_building_time
+			response_time, dom_building_time,
+			base_path
 		) VALUES (
-			$1, $2, $3, $4, $5, $6, $7, $8,
+			$1, $2, $3, 
+			$4, $5, 
+			$6, $7, $8,
 			NULLIF($9, 0), NULLIF($10, 0), NULLIF($11, 0), NULLIF($12, 0), NULLIF($13, 0), 
 			NULLIF($14, 0), NULLIF($15, 0), NULLIF($16, 0),
-			NULLIF($17, 0), NULLIF($18, 0)
+			NULLIF($17, 0), NULLIF($18, 0),
+			'',
 		)
 		`,
-		sessionID, e.MessageID, e.Timestamp, e.Referrer, url.DiscardURLQuery(e.Referrer), host, path, url.DiscardURLQuery(path),
+		sessionID, e.MessageID, e.Timestamp,
+		e.Referrer, url.DiscardURLQuery(e.Referrer),
+		host, path, query,
 		e.DomContentLoadedEventEnd, e.LoadEventEnd, e.ResponseEnd, e.FirstPaint, e.FirstContentfulPaint,
 		e.SpeedIndex, e.VisuallyComplete, e.TimeToInteractive,
 		calcResponseTime(e), calcDomBuildingTime(e),
@@ -109,7 +116,7 @@ func (conn *Conn) InsertWebClickEvent(sessionID uint64, e *ClickEvent) error {
 		INSERT INTO events.clicks
 			(session_id, message_id, timestamp, label, selector, url)
 		(SELECT
-			$1, $2, $3, NULLIF($4, ''), $5, host || base_path
+			$1, $2, $3, NULLIF($4, ''), $5, host || path
 			FROM events.pages
 			WHERE session_id = $1 AND timestamp <= $3 ORDER BY timestamp DESC LIMIT 1
 		)
@@ -211,19 +218,26 @@ func (conn *Conn) InsertWebFetchEvent(sessionID uint64, savePayload bool, e *Fet
 		response = &e.Response
 	}
 	conn.insertAutocompleteValue(sessionID, "REQUEST", url.DiscardURLQuery(e.URL))
+	host, path, query, err := url.GetURLParts(e.URL)
+	if err != nil {
+		return err
+	}
 	return conn.batchQueue(sessionID, `
 		INSERT INTO events_common.requests (
-			session_id, timestamp, 
-			seq_index, url, duration, success,
-			request_body, response_body, status_code, method
+			session_id, timestamp, seq_index, 
+			url, host, path, query,
+			request_body, response_body, status_code, method,
+			duration, success,
 		) VALUES (
-			$1, $2, 
-			$3, $4, $5, $6,
-			$7, $8, $9::smallint, NULLIF($10, '')::http_method
+			$1, $2, $3, 
+			$4, $5, $6, $7
+			$8, $9, $10::smallint, NULLIF($11, '')::http_method,
+			$12, $13
 		) ON CONFLICT DO NOTHING`,
-		sessionID, e.Timestamp,
-		getSqIdx(e.MessageID), e.URL, e.Duration, e.Status < 400,
+		sessionID, e.Timestamp, getSqIdx(e.MessageID),
+		e.URL, host, path, query,
 		request, response, e.Status, url.EnsureMethod(e.Method),
+		e.Duration, e.Status < 400,
 	)
 
 }
diff --git a/backend/pkg/url/url.go b/backend/pkg/url/url.go
index b9181774d..48cd0ef8d 100644
--- a/backend/pkg/url/url.go
+++ b/backend/pkg/url/url.go
@@ -1,18 +1,19 @@
 package url
 
 import (
-	"strings"
 	_url "net/url"
+	"strings"
 )
 
 func DiscardURLQuery(url string) string {
 	return strings.Split(url, "?")[0]
-} 
+}
 
-func GetURLParts(rawURL string) (string, string, error) {
+func GetURLParts(rawURL string) (string, string, string, error) {
 	u, err := _url.Parse(rawURL)
 	if err != nil {
-		return "", "", err
+		return "", "", "", err
 	}
-	return u.Host, u.RequestURI(), nil
-}
\ No newline at end of file
+	// u.Scheme  ?
+	return u.Host, u.RawPath, u.RawQuery, nil
+}