diff --git a/Buy.lua b/Buy.lua
index 3a01cb0..da325d5 100644
--- a/Buy.lua
+++ b/Buy.lua
@@ -118,9 +118,9 @@ function processScanResults(rawData)
 		if rawDatum.buyoutPrice > 0 and rawDatum.owner ~= UnitName("player") then
 			tinsert(entries, {
 					name		= rawDatum.name,
-					stackSize	= rawDatum.stackSize,
+					stackSize	= rawDatum.count,
 					buyoutPrice	= rawDatum.buyoutPrice,
-					itemPrice	= rawDatum.buyoutPrice / rawDatum.stackSize,
+					itemPrice	= rawDatum.buyoutPrice / rawDatum.count,
 					quality		= rawDatum.quality,
 			})
 		end
diff --git a/Buy.xml b/Buy.xml
index 7322554..abb4227 100644
--- a/Buy.xml
+++ b/Buy.xml
@@ -117,7 +117,7 @@
 				</Texture>
 
 				<FontString inherits="GameFontHighlightSmall" text="Name">
-					<Anchors><Anchor point="LEFT" relativePoint="LEFT" relativeTo="$parentMiddle"><Offset><AbsDimension x="25" y="1"/></Offset></Anchor></Anchors>
+					<Anchors><Anchor point="LEFT" relativePoint="LEFT" relativeTo="$parentMiddle"><Offset><AbsDimension x="27" y="1"/></Offset></Anchor></Anchors>
 				</FontString>
 				
 				<FontString inherits="GameFontHighlightSmall" text="Unit Price">
diff --git a/Scan.lua b/Scan.lua
index dae4c42..dbb7249 100644
--- a/Scan.lua
+++ b/Scan.lua
@@ -122,11 +122,17 @@ function processQueryResults()
 	
 		local name, texture, count, quality, canUse, level, minBid, minIncrement, buyoutPrice, bidAmount, highBidder, owner = GetAuctionItemInfo("list", i)
 		local duration = GetAuctionItemTimeLeft("list", i)
+		AuctionatorScanTooltip:SetOwner(UIParent, "ANCHOR_NONE");
+		AuctionatorScanTooltip:SetAuctionItem("list", i)
+		AuctionatorScanTooltip:Show()
+		local chargesLabel = getglobal("AuctionatorScanTooltipTextLeft"..4):GetText()
+		local chargesString = gsub(chargesLabel and chargesLabel or "","%D", "")
+		local charges = tonumber(chargesString)
 
-		local scanDatum = {		
+		local scanDatum = {
 				name			= name,
 				texture			= texture,
-				stackSize		= count,
+				count			= charges and charges or count,
 				quality			= quality,
 				canUse			= canUse,
 				level			= level,
diff --git a/Scan.xml b/Scan.xml
index 9bab952..200a2a0 100644
--- a/Scan.xml
+++ b/Scan.xml
@@ -16,4 +16,5 @@
 			</OnUpdate>
 		</Scripts> 
 	</Frame>
+	<GameTooltip name="AuctionatorScanTooltip" inherits="GameTooltipTemplate"/>
 </Ui>
\ No newline at end of file
diff --git a/Sell.lua b/Sell.lua
index 46b3739..e8ffae0 100644
--- a/Sell.lua
+++ b/Sell.lua
@@ -380,7 +380,7 @@ function processScanResults(rawData, auctionItemName)
 				condData[key].count = condData[key].count + 1
 			else			
 				condData[key] = {
-						stackSize 	= rawDatum.stackSize,
+						stackSize 	= rawDatum.count,
 						buyoutPrice	= rawDatum.buyoutPrice,
 						itemPrice		= rawDatum.buyoutPrice / rawDatum.stackSize,
 						count			= 1,
diff --git a/Sell.xml b/Sell.xml
index ede120f..e8b68ad 100644
--- a/Sell.xml
+++ b/Sell.xml
@@ -36,11 +36,11 @@
 			
 			<Frame>
 				<Size><AbsDimension x="100" y="16" /></Size>
-				<Anchors><Anchor point="LEFT"><Offset><AbsDimension x="170" y="-3"/></Offset></Anchor></Anchors>
+				<Anchors><Anchor point="LEFT"><Offset><AbsDimension x="250" y="-3"/></Offset></Anchor></Anchors>
 				<Layers>
 					<Layer level="BACKGROUND">
 						<FontString name="$parent_Availability" inherits="GameFontHighlightSmall">
-							<Anchors><Anchor point="TOPRIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
+							<Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
 						</FontString>
 					</Layer>
 				</Layers>
@@ -141,7 +141,7 @@
 				</FontString>
 
 				<FontString inherits="GameFontHighlightSmall" text="Stacks">
-					<Anchors><Anchor point="LEFT" relativePoint="LEFT" relativeTo="$parentMiddle"><Offset><AbsDimension x="220" y="1"/></Offset></Anchor></Anchors>
+					<Anchors><Anchor point="LEFT" relativePoint="LEFT" relativeTo="$parentMiddle"><Offset><AbsDimension x="253" y="1"/></Offset></Anchor></Anchors>
 				</FontString>
 
 				<FontString inherits="GameFontHighlightSmall" text="">