diff --git a/Socialmetrica.package/NitterUser.class/instance/getMessages.st b/Socialmetrica.package/NitterUser.class/instance/getMessages.st
index d16113d..4f8a70d 100644
--- a/Socialmetrica.package/NitterUser.class/instance/getMessages.st
+++ b/Socialmetrica.package/NitterUser.class/instance/getMessages.st
@@ -4,19 +4,20 @@ getMessages
 	lastTweetsRaw := self rssFeed xmlDocument xpath: '//item'.
 	lastTweets := TweetsCollection new.
 	customQuery := Dictionary new
-		at: 'parameters' put: self;
+		at: 'parameters' put: self userNameLink;
 		at: 'date' put: DateAndTime now;
 		yourself.
 	lastTweets query: customQuery. 
-	lastTweetsRaw doWithIndex: [ :rssTweet :i | | tempTweet |
-		tempTweet := Tweet new fromNitterRssItem: rssTweet.
-		tempTweet metadata 
-			at: 'queryDate' put: (customQuery at: 'date');
-			at: 'order' put: i;
-			yourself.
-		tempTweet user userName = self userName 
-			ifFalse: [ tempTweet retweetedBy add: self userName ].
-		lastTweets add: tempTweet
+	lastTweetsRaw doWithIndex: [ :rssTweet :i | | current previous |
+		current := Tweet new fromNitterRssItem: rssTweet.
+		i < lastTweetsRaw size ifTrue: [
+			previous := Tweet new fromNitterRssItem: (lastTweetsRaw at: i + 1).
+		 	current timelines  
+			 	at: self userName put: previous id;
+			 	yourself.
+		].
+		current queries add: customQuery.
+		lastTweets add: current.
 	].
 	^ lastTweets
 	
\ No newline at end of file
diff --git a/Socialmetrica.package/Tweet.class/instance/asCardElement.st b/Socialmetrica.package/Tweet.class/instance/asCardElement.st
index d41f2aa..531d78d 100644
--- a/Socialmetrica.package/Tweet.class/instance/asCardElement.st
+++ b/Socialmetrica.package/Tweet.class/instance/asCardElement.st
@@ -25,14 +25,6 @@ asCardElement
 						fitContent;
 						cellSpacing: 5;
 						addChildren: { 
-							BrButton new
-								aptitude: BrGlamorousButtonWithLabelAptitude new;
-								label: 'Toggle subtopics';
-								action: [ anEditor beEditable ].
-							BrButton new
-								aptitude: BrGlamorousButtonWithLabelAptitude new;
-								label: 'Add subtopic keyword';
-								action: [ anEditor beReadOnlyWithSelection ].
 							BrButton new
 								aptitude: BrGlamorousButtonWithLabelAptitude new;
 								label: 'Details';
diff --git a/Socialmetrica.package/Tweet.class/instance/queries.st b/Socialmetrica.package/Tweet.class/instance/queries.st
new file mode 100644
index 0000000..4015611
--- /dev/null
+++ b/Socialmetrica.package/Tweet.class/instance/queries.st
@@ -0,0 +1,4 @@
+accessing
+queries
+	"A list of the queries where the tweet has been present"
+	^ self metadata at: 'queries' ifAbsentPut: [ OrderedCollection new ]
\ No newline at end of file
diff --git a/Socialmetrica.package/Tweet.class/instance/retweetedBy.st b/Socialmetrica.package/Tweet.class/instance/retweetedBy.st
index c9a1193..e6389d0 100644
--- a/Socialmetrica.package/Tweet.class/instance/retweetedBy.st
+++ b/Socialmetrica.package/Tweet.class/instance/retweetedBy.st
@@ -1,3 +1,3 @@
 accessing
 retweetedBy
-	^ self metadata at: 'retweetedBy' ifAbsentPut: [ Set new ]
\ No newline at end of file
+	^ self timelines keys collect: [ :author  | author != self user userName ]
\ No newline at end of file
diff --git a/Socialmetrica.package/Tweet.class/instance/timelines.st b/Socialmetrica.package/Tweet.class/instance/timelines.st
new file mode 100644
index 0000000..ea24a75
--- /dev/null
+++ b/Socialmetrica.package/Tweet.class/instance/timelines.st
@@ -0,0 +1,5 @@
+accessing
+timelines
+	"A dictionary of several the timelines where this tweet appears.
+	The key is the user's timeline and the value is the message id before this particular message appears in such user's timeline."
+	^ self metadata at: 'timelines' ifAbsentPut: [ Dictionary new ].
\ No newline at end of file