diff --git a/src/scrapers/porndoe.js b/src/scrapers/porndoe.js
index ded163c9..194924b7 100755
--- a/src/scrapers/porndoe.js
+++ b/src/scrapers/porndoe.js
@@ -11,12 +11,12 @@ function scrapeAll(scenes) {
 		release.url = query.url('a');
 		release.entryId = release.url.match(/\/watch\/(\d+)/)[1];
 
-		release.title = query.cnt('[class*="item-title"] a') || query.q('.bottom .link', 'title');
+		release.title = query.content('[class*="item-title"] a') || query.attribute('.bottom .link', 'title');
 		release.date = query.date('[class*="item-date"]', 'MMM DD, YYYY');
 
 		release.actors = query.all('[class*="item-actors"] a').map((el) => ({
-			name: query.cnt(el),
-			url: query.url(el, null),
+			name: unprint.query.content(el),
+			url: unprint.query.url(el, null),
 		}));
 
 		// const poster = query.img('.thumb img');
@@ -30,7 +30,7 @@ function scrapeAll(scenes) {
 		}
 
 		release.teaser = query.video('video-preview');
-		release.channel = slugify(query.q('[class*="item-channel"] a', 'title'), '');
+		release.channel = slugify(query.attribute('[class*="item-channel"] a', 'title'), '');
 
 		return release;
 	});
@@ -39,30 +39,31 @@ function scrapeAll(scenes) {
 function scrapeScene({ query }, url) {
 	const release = {};
 
-	release.title = query.q('h1', true);
+	release.title = query.content('h1');
 	release.entryId = url.match(/\/watch\/(\d+)/)[1];
 
-	release.description = query.meta('name=description') || query.q('read-even-more', true);
+	release.description = query.content('.-mvd-description') || query.attribute('meta[name="description"]', 'content');
 
-	release.date = query.date('.-mvd-grid-stats', 'MMM DD, YYYY', /\w{3} \d{1,2}, \d{4}/);
+	release.date = query.date('.-mvd-grid-stats', 'MMM DD, YYYY', /\w{3} \d{1,2}, \d{4}/)
+		|| query.date('meta[itemprop="uploadDate"]', 'YYYY-MM-DD', { attribute: 'content' });
 
 	release.actors = query.all('.video-top-details a[href*="/models"]').map((el) => ({
-		name: query.cnt(el),
-		url: query.url(el, null),
+		name: unprint.query.content(el),
+		url: unprint.query.url(el, null),
 	}));
 
-	release.duration = query.dur('meta[itemprop="duration"]', null, 'content');
-	release.tags = query.all('.-vpta-bottom a[href*="/categories"], .-vpta-bottom a[href*="/tags"]', true);
+	release.duration = query.duration('meta[itemprop="duration"]', { attribute: 'content' });
+	release.tags = query.contents('.-vpta-bottom a[href*="/categories"], .-vpta-bottom a[href*="/tags"]');
 
-	release.poster = query.img('.poster img') || query.meta('itemprop=thumbnailUrl');
+	release.poster = query.img('.poster img') || query.attribute('meta[itemprop="thumbnailUrl"]', 'content');
 	release.photos = query.imgs('#gallery-thumbs [class*="thumb"]', 'data-bg').slice(1).map((photo) => [ // first image is poster
 		photo.replace('512x288', '1472x828'),
 		photo,
 	]);
 
-	release.trailer = query.meta('itemprop=contentURL');
+	release.trailer = query.attribute('meta[itemprop="contentURL"]', 'content');
 
-	release.channel = slugify(query.q('.video-top-details a[href*="/channels"]', true), '');
+	release.channel = slugify(query.content('.video-top-details a[href*="/channels"]'), '');
 
 	return release;
 }