diff --git a/webclient/src/Results.js b/webclient/src/Results.js
index ea339fc..ef9f1a0 100644
--- a/webclient/src/Results.js
+++ b/webclient/src/Results.js
@@ -1,95 +1,73 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
+import React, { useState, useEffect } from 'react';
+import { Link, useLocation } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 import { sourceLink, infoLine, logos } from './utils.js';
 import AbortController from 'abort-controller';
 
-class Results extends React.Component {
-	constructor(props) {
-		super(props);
+function Results() {
+	const [stories, setStories] = useState(false);
+	const [error, setError] = useState(false);
+	const location = useLocation();
 
-		this.state = {
-			stories: false,
-			error: false,
-		};
+	useEffect(() => {
+		const controller = new AbortController();
+		const signal = controller.signal;
 
-		this.controller = null;
-	}
-
-	performSearch = () => {
-		if (this.controller) {
-			this.controller.abort();
-		}
-
-		this.controller = new AbortController();
-		const signal = this.controller.signal;
-
-		const search = this.props.location.search;
+		const search = location.search;
 		fetch('/api/search' + search, { method: 'get', signal: signal })
 			.then(res => res.json())
 			.then(
 				(result) => {
-					this.setState({ stories: result.hits });
+					setStories(result.hits);
 				},
 				(error) => {
 					if (error.message !== 'The operation was aborted. ') {
-						this.setState({ error: true });
+						setError(true);
 					}
 				}
 			);
-	}
 
-	componentDidMount() {
-		this.performSearch();
-	}
+		return () => {
+			controller.abort();
+		};
+	}, [location.search]);
 
-	componentDidUpdate(prevProps) {
-		if (this.props.location.search !== prevProps.location.search) {
-			this.performSearch();
-		}
-	}
+	return (
+		<div className='container'>
+			<Helmet>
+				<title>Search Results | QotNews</title>
+			</Helmet>
+			{error && <p>Connection error?</p>}
+			{stories ?
+				<>
+					<p>Search results:</p>
+					<div className='comment lined'>
+						{stories.length ?
+							stories.map(x =>
+								<div className='item' key={x.id}>
+									<div className='title'>
+										<Link className='link' to={'/' + x.id}>
+											<img className='source-logo' src={logos[x.source]} alt='source logo' /> {x.title}
+										</Link>
 
-	render() {
-		const stories = this.state.stories;
-		const error = this.state.error;
-
-		return (
-			<div className='container'>
-				<Helmet>
-					<title>Search Results | QotNews</title>
-				</Helmet>
-				{error && <p>Connection error?</p>}
-				{stories ?
-					<>
-						<p>Search results:</p>
-						<div className='comment lined'>
-							{stories.length ?
-								stories.map(x =>
-									<div className='item' key={x.id}>
-										<div className='title'>
-											<Link className='link' to={'/' + x.id}>
-												<img className='source-logo' src={logos[x.source]} alt='source logo' /> {x.title}
-											</Link>
-
-											<span className='source'>
-												({sourceLink(x)})
-											</span>
-										</div>
-
-										{infoLine(x)}
+										<span className='source'>
+											({sourceLink(x)})
+										</span>
 									</div>
-								)
-							:
-								<p>none</p>
-							}
-						</div>
-					</>
-				:
-					<p>loading...</p>
-				}
-			</div>
-		);
-	}
+
+									{infoLine(x)}
+								</div>
+							)
+						:
+							<p>none</p>
+						}
+					</div>
+				</>
+			:
+				<p>loading...</p>
+			}
+		</div>
+	);
 }
 
 export default Results;