diff --git a/src/components/basket/export-options/crn-script.tsx b/src/components/basket/export-options/crn-script.tsx
index b2e487e..88074b2 100644
--- a/src/components/basket/export-options/crn-script.tsx
+++ b/src/components/basket/export-options/crn-script.tsx
@@ -147,6 +147,30 @@ const CRNScript = ({isOpen, onClose}: CRNScriptProps) => {
 							)
 						}
 
+						{
+							basketState.courseIds.length > 0 && (
+								<Alert status="warning" rounded="md">
+									<AlertIcon/>
+									<AlertTitle>Warning:</AlertTitle>
+									<AlertDescription>
+										You have {basketState.courseIds.length} {basketState.courseIds.length > 2 ? 'courses' : 'course'} (instead of {basketState.courseIds.length > 2 ? 'sections' : 'section'}) in your basket. They will not be added to the generated script.
+									</AlertDescription>
+								</Alert>
+							)
+						}
+
+						{
+							basketState.searchQueries.length > 0 && (
+								<Alert status="warning" rounded="md">
+									<AlertIcon/>
+									<AlertTitle>Warning:</AlertTitle>
+									<AlertDescription>
+										You have {basketState.searchQueries.length} search queries in your basket. They will not be added to the generated script.
+									</AlertDescription>
+								</Alert>
+							)
+						}
+
 						<FormControl>
 							<FormLabel>Operating system:</FormLabel>
 
diff --git a/src/components/basket/table.tsx b/src/components/basket/table.tsx
index 2e41e77..b5b70e7 100644
--- a/src/components/basket/table.tsx
+++ b/src/components/basket/table.tsx
@@ -8,6 +8,7 @@ import TimeDisplay from 'src/components/sections-table/time-display';
 import useStore from 'src/lib/state/context';
 import getCreditsString from 'src/lib/get-credits-str';
 import {BasketState} from 'src/lib/state/basket';
+import {ICourseFromAPI} from 'src/lib/api-types';
 import styles from './styles/table.module.scss';
 
 const SkeletonRow = () => (
@@ -42,12 +43,15 @@ const SkeletonRow = () => (
 );
 
 type RowProps = {
-	section: BasketState['sections'][0];
-	isForCapture: boolean;
+	isForCapture?: boolean;
 	handleSearch: (query: string) => void;
 };
 
-const Row = observer(({section, isForCapture, handleSearch}: RowProps) => {
+type SectionRowProps = RowProps & {
+	section: BasketState['sections'][0];
+};
+
+const SectionRow = observer(({section, isForCapture, handleSearch}: SectionRowProps) => {
 	const {basketState, apiState} = useStore();
 
 	return (
@@ -124,6 +128,107 @@ const Row = observer(({section, isForCapture, handleSearch}: RowProps) => {
 	);
 });
 
+type CourseRowProps = RowProps & {
+	course: ICourseFromAPI;
+};
+
+const CourseRow = observer(({isForCapture, handleSearch, course}: CourseRowProps) => {
+	const {basketState} = useStore();
+
+	return (
+		<Tr>
+			<Td colSpan={6}>
+				{course.title}
+			</Td>
+
+			<Td isNumeric>
+				{course.credits}
+			</Td>
+
+			{
+				!isForCapture && (
+					<>
+						<Td/>
+						<Td isNumeric>
+							<IconButton
+								colorScheme="blue"
+								icon={<Search2Icon/>}
+								size="sm"
+								aria-label="Go to course"
+								onClick={() => {
+									handleSearch(`${course.subject}${course.crse}`);
+								}}/>
+						</Td>
+						<Td isNumeric>
+							<IconButton
+								colorScheme="red"
+								icon={<DeleteIcon/>}
+								size="sm"
+								aria-label="Remove from basket"
+								onClick={() => {
+									basketState.removeCourse(course.id);
+								}}/>
+						</Td>
+					</>
+				)
+			}
+		</Tr>
+	);
+});
+
+type SearchQueryRowProps = RowProps & {
+	query: {
+		query: string;
+		credits?: [number, number];
+	};
+};
+
+const SearchQueryRow = observer(({isForCapture, handleSearch, query}: SearchQueryRowProps) => {
+	const {basketState} = useStore();
+
+	return (
+		<Tr>
+			<Td colSpan={6}>
+				<Tag size="lg">
+					{query.query}
+				</Tag>
+			</Td>
+
+			<Td isNumeric>
+				{query.credits ? getCreditsString(...query.credits) : ''}
+			</Td>
+
+			{
+				!isForCapture && (
+					<>
+						<Td/>
+						<Td isNumeric>
+							<IconButton
+								colorScheme="blue"
+								icon={<Search2Icon/>}
+								size="sm"
+								aria-label="Go to section"
+								onClick={() => {
+									handleSearch(query.query);
+								}}/>
+						</Td>
+						<Td isNumeric>
+							<IconButton
+								colorScheme="red"
+								icon={<DeleteIcon/>}
+								size="sm"
+								aria-label="Remove from basket"
+								onClick={() => {
+									basketState.removeSearchQuery(query.query);
+								}}/>
+						</Td>
+					</>
+				)
+			}
+		</Tr>
+	);
+});
+
 type BasketTableProps = {
 	onClose?: () => void;
 	isForCapture?: boolean;
@@ -142,56 +247,42 @@ const BodyWithData = observer(({onClose, isForCapture}: BasketTableProps) => {
 
 	return (
 		<Tbody>
-			{basketState.sections.map(section => (
-				<Row
-					key={section.id}
-					section={section}
-					isForCapture={isForCapture ?? false}
-					handleSearch={handleSearch}/>
-			))}
 			{
-				basketState.searchQueries.map(query => (
-					<Tr key={query}>
-						<Td colSpan={isForCapture ? 6 : 8}>
-							<Tag size="lg">
-								{query}
-							</Tag>
-						</Td>
-						{
-							!isForCapture && (
-								<>
-									<Td isNumeric>
-										<IconButton
-											colorScheme="blue"
-											icon={<Search2Icon/>}
-											size="sm"
-											aria-label="Go to section"
-											onClick={() => {
-												handleSearch(query);
-											}}/>
-									</Td>
-									<Td isNumeric>
-										<IconButton
-											colorScheme="red"
-											icon={<DeleteIcon/>}
-											size="sm"
-											aria-label="Remove from basket"
-											onClick={() => {
-												basketState.removeSearchQuery(query);
-											}}/>
-									</Td>
-								</>
-							)
-						}
-					</Tr>
+				basketState.sections.map(section => (
+					<SectionRow
+						key={section.id}
+						section={section}
+						isForCapture={isForCapture}
+						handleSearch={handleSearch}/>
+				))
+			}
+
+			{
+				basketState.courses.map(course => (
+					<CourseRow
+						key={course.id}
+						course={course}
+						isForCapture={isForCapture}
+						handleSearch={handleSearch}/>
+				))
+			}
+
+			{
+				basketState.parsedQueries.map(query => (
+					<SearchQueryRow
+						key={query.query}
+						query={query}
+						isForCapture={isForCapture}
+						handleSearch={handleSearch}/>
 				))
 			}
 
 			<Tr fontWeight="bold">
 				<Td>Total:</Td>
-				{/* eslint-disable-next-line react/no-array-index-key */}
-				{Array.from({length: 5}).map((_, i) => (<Td key={i}/>))}
-				<Td isNumeric>{basketState.totalCredits}</Td>
+				<Td colSpan={5}/>
+				<Td isNumeric>
+					{getCreditsString(...basketState.totalCredits)}
+				</Td>
 				{
 					!isForCapture && (
 						<>
diff --git a/src/components/courses-table/details-row.tsx b/src/components/courses-table/details-row.tsx
index 6fc8698..2909a2c 100644
--- a/src/components/courses-table/details-row.tsx
+++ b/src/components/courses-table/details-row.tsx
@@ -1,5 +1,18 @@
 import React from 'react';
-import {Tr, Td, VStack, Text, Box, Heading, Button, Collapse, IconButton, HStack, Spacer} from '@chakra-ui/react';
+import {
+	Tr,
+	Td,
+	VStack,
+	Text,
+	Box,
+	Heading,
+	Button,
+	Collapse,
+	IconButton,
+	HStack,
+	Spacer,
+	Stack,
+} from '@chakra-ui/react';
 import {observer} from 'mobx-react-lite';
 import {faShare} from '@fortawesome/free-solid-svg-icons';
 import SectionsTable from 'src/components/sections-table';
@@ -7,6 +20,8 @@ import CourseStats from 'src/components/course-stats';
 import useStore from 'src/lib/state/context';
 import {ICourseWithFilteredSections} from 'src/lib/state/ui';
 import WrappedFontAwesomeIcon from 'src/components/wrapped-font-awesome-icon';
+import toTitleCase from 'src/lib/to-title-case';
+import {AddIcon, DeleteIcon} from '@chakra-ui/icons';
 
 const Stats = observer(({courseKey}: {courseKey: string}) => {
 	const store = useStore();
@@ -29,8 +44,21 @@ const Stats = observer(({courseKey}: {courseKey: string}) => {
 });
 
 const DetailsRow = ({course, onlyShowSections, onShowEverything, onShareCourse}: {course: ICourseWithFilteredSections; onlyShowSections: boolean; onShowEverything: () => void; onShareCourse: () => void}) => {
+	const {basketState} = useStore();
 	const courseKey = `${course.course.subject}${course.course.crse}`;
 
+	const courseSections = course.sections.wasFiltered ? course.sections.filtered : course.sections.all;
+
+	const isCourseInBasket = basketState.hasCourse(course.course.id);
+
+	const handleBasketAction = () => {
+		if (isCourseInBasket) {
+			basketState.removeCourse(course.course.id);
+		} else {
+			basketState.addCourse(course.course.id);
+		}
+	};
+
 	return (
 		<Tr>
 			<Td colSpan={5}>
@@ -47,13 +75,41 @@ const DetailsRow = ({course, onlyShowSections, onShowEverything, onShareCourse}:
 						<VStack spacing={10} align="flex-start" w="full">
 							<VStack spacing={4} align="flex-start" w="full">
 								<HStack w="full">
-									<Text whiteSpace="normal">
-										<b>Description: </b>
-										{course.course.description}
-									</Text>
+									<Stack>
+										<Text whiteSpace="normal">
+											<b>Description: </b>
+											{course.course.description}
+										</Text>
+
+										{
+											course.course.offered.length > 0 && (
+												<Text whiteSpace="normal">
+													<b>Semesters offered: </b>
+													{toTitleCase(course.course.offered.join(', '))}
+												</Text>
+											)
+										}
+									</Stack>
 
 									<Spacer/>
-									<IconButton icon={<WrappedFontAwesomeIcon icon={faShare}/>} aria-label="Share course" variant="ghost" colorScheme="brand" title="Share course" onClick={onShareCourse}/>
+
+									<VStack>
+										<IconButton
+											icon={<WrappedFontAwesomeIcon icon={faShare}/>}
+											aria-label="Share course"
+											variant="ghost"
+											colorScheme="brand"
+											title="Share course"
+											onClick={onShareCourse}/>
+
+										<IconButton
+											icon={isCourseInBasket ? <DeleteIcon/> : <AddIcon/>}
+											aria-label="Add course to basket"
+											title="Add course to basket"
+											size="xs"
+											colorScheme={isCourseInBasket ? 'red' : undefined}
+											onClick={handleBasketAction}/>
+									</VStack>
 								</HStack>
 
 								{
@@ -70,17 +126,21 @@ const DetailsRow = ({course, onlyShowSections, onShowEverything, onShareCourse}:
 						</VStack>
 					</Collapse>
 
-					<Box w="100%">
-						{!onlyShowSections && (
-							<Heading mb={4}>Sections</Heading>
-						)}
+					{
+						courseSections.length > 0 && (
+							<Box w="100%">
+								{!onlyShowSections && (
+									<Heading mb={4}>Sections</Heading>
+								)}
 
-						<SectionsTable shadow="base" borderRadius="md" sections={course.sections.wasFiltered ? course.sections.filtered : course.sections.all}/>
-					</Box>
+								<SectionsTable shadow="base" borderRadius="md" sections={courseSections}/>
+							</Box>
+						)
+					}
 				</VStack>
 			</Td>
 		</Tr>
 	);
 };
 
-export default DetailsRow;
+export default observer(DetailsRow);
diff --git a/src/components/courses-table/row.tsx b/src/components/courses-table/row.tsx
index 013db29..8a67b7a 100644
--- a/src/components/courses-table/row.tsx
+++ b/src/components/courses-table/row.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useLayoutEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {Tr, Td, IconButton, useDisclosure, usePrevious} from '@chakra-ui/react';
 import {InfoIcon, InfoOutlineIcon} from '@chakra-ui/icons';
 import {observer} from 'mobx-react-lite';
@@ -16,6 +16,11 @@ const TableRow = observer(({course, onShareCourse}: {course: ICourseWithFiltered
 
 	const creditsString: string = useMemo(() => {
 		if (sections.length === 0) {
+			const {credits} = course.course;
+			if (credits !== null) {
+				return getCreditsStr(credits, credits);
+			}
+
 			return '';
 		}
 
@@ -34,8 +39,7 @@ const TableRow = observer(({course, onShareCourse}: {course: ICourseWithFiltered
 		return getCreditsStr(min, max);
 	}, [sections]);
 
-	// TODO: can this use useEffect instead?
-	useLayoutEffect(() => {
+	useEffect(() => {
 		if (course.sections.wasFiltered !== wasPreviouslyFiltered) {
 			if (course.sections.wasFiltered) {
 				setOnlyShowSections(true);
diff --git a/src/components/navbar.tsx b/src/components/navbar.tsx
index fe8513a..c831a2a 100644
--- a/src/components/navbar.tsx
+++ b/src/components/navbar.tsx
@@ -6,6 +6,8 @@ import {observer} from 'mobx-react-lite';
 import useStore from 'src/lib/state/context';
 import Logo from 'public/images/logo.svg';
 import {SEMESTER_DISPLAY_MAPPING} from 'src/lib/constants';
+import {ISemesterFilter} from 'src/lib/state/api';
+import toTitleCase from 'src/lib/to-title-case';
 import ColorModeToggle from './color-mode-toggle';
 import Link from './link';
 
@@ -24,6 +26,16 @@ const PAGES = [
 	},
 ];
 
+const getSemesterDisplayName = (semester: ISemesterFilter) => {
+	if (semester.isFuture) {
+		return toTitleCase(`Future ${semester.semester.toLowerCase()} Semester`);
+	}
+
+	return `${SEMESTER_DISPLAY_MAPPING[semester.semester]} ${semester.year}`;
+};
+
+const PATHS_THAT_REQUIRE_SEMESTER_SELECTOR = new Set(['/', '/help/registration-script']);
+
 const Navbar = () => {
 	const router = useRouter();
 	const store = useStore();
@@ -34,9 +46,10 @@ const Navbar = () => {
 
 	const handleSemesterSelect = useCallback(async (event: React.ChangeEvent<HTMLSelectElement>) => {
 		store.apiState.setSelectedSemester(JSON.parse(event.target.value));
-		await store.apiState.revalidate();
 	}, [store]);
 
+	const shouldShowSemesterSelector = PATHS_THAT_REQUIRE_SEMESTER_SELECTOR.has(router.pathname);
+
 	return (
 		<Flex align="center" justify="space-between" wrap="wrap" p={4} as="nav" mb={8}>
 			<Box width="40px" height="40px" borderRadius="full" overflow="hidden" mr={5}>
@@ -68,8 +81,7 @@ const Navbar = () => {
 			>
 
 				{
-					// TODO: this should be extracted out into a common layout helper attribute
-					['/', '/help/registration-script'].includes(router.pathname) && (
+					shouldShowSemesterSelector && (
 						<Select
 							w="auto"
 							variant="filled"
@@ -82,10 +94,9 @@ const Navbar = () => {
 								store.apiState.sortedSemesters.map(semester => (
 									<option
 										key={JSON.stringify(semester)}
-										defaultChecked={store.apiState.selectedSemester?.semester === semester.semester && store.apiState.selectedSemester.year === semester.year}
 										value={JSON.stringify(semester)}
 									>
-										{SEMESTER_DISPLAY_MAPPING[semester.semester]} {semester.year}
+										{getSemesterDisplayName(semester)}
 									</option>
 								))
 							}
diff --git a/src/components/search-bar.tsx b/src/components/search-bar.tsx
index acdbd98..54976da 100644
--- a/src/components/search-bar.tsx
+++ b/src/components/search-bar.tsx
@@ -89,33 +89,34 @@ const SearchBar = (props: SearchBarProps) => {
 					right={4}
 					zIndex={10}
 				>
-					<Fade in={props.value !== ''}>
-						{
-							props.onQuerySaveOrDelete && (
-								// TODO: hide when query is empty
-								<Tooltip label={props.isQuerySaved ? 'remove query from basket' : 'save query to basket'}>
-									<IconButton
-										colorScheme={props.isQuerySaved ? 'red' : 'purple'}
-										icon={props.isQuerySaved ? <DeleteIcon/> : <StarIcon/>}
-										aria-label={props.isQuerySaved ? 'Remove from basket' : 'Save to basket'}
-										rounded="full"
-										size="xs"
-										mr={2}
-										onClick={props.onQuerySaveOrDelete}
-									/>
-								</Tooltip>
-							)
-						}
+					{props.value !== '' && (
+						<Fade in>
+							{
+								props.onQuerySaveOrDelete && (
+									<Tooltip label={props.isQuerySaved ? 'remove query from basket' : 'save query to basket'}>
+										<IconButton
+											colorScheme={props.isQuerySaved ? 'red' : 'purple'}
+											icon={props.isQuerySaved ? <DeleteIcon/> : <StarIcon/>}
+											aria-label={props.isQuerySaved ? 'Remove from basket' : 'Save to basket'}
+											rounded="full"
+											size="xs"
+											mr={2}
+											onClick={props.onQuerySaveOrDelete}
+										/>
+									</Tooltip>
+								)
+							}
 
-						<IconButton
-							icon={<CloseIcon/>}
-							aria-label="Clear query"
-							rounded="full"
-							size="xs"
-							onClick={() => {
-								props.onChange('');
-							}}/>
-					</Fade>
+							<IconButton
+								icon={<CloseIcon/>}
+								aria-label="Clear query"
+								rounded="full"
+								size="xs"
+								onClick={() => {
+									props.onChange('');
+								}}/>
+						</Fade>
+					)}
 				</Box>
 			</InputGroup>
 
diff --git a/src/lib/api-types.ts b/src/lib/api-types.ts
index 7e74c42..36adfd1 100644
--- a/src/lib/api-types.ts
+++ b/src/lib/api-types.ts
@@ -89,6 +89,8 @@ export interface ICourseFromAPI {
 	prereqs: string | null;
 	updatedAt: string;
 	deletedAt: string | null;
+	offered: string[];
+	credits: number | null;
 }
 export interface ITransferCourseFromAPI {
 	id: string;
diff --git a/src/lib/do-schedules-conflict.ts b/src/lib/do-schedules-conflict.ts
index db4d493..ed0846f 100644
--- a/src/lib/do-schedules-conflict.ts
+++ b/src/lib/do-schedules-conflict.ts
@@ -1,5 +1,5 @@
 import compareTimes from './compare-times';
-import {Schedule} from './rschedule';
+import {Schedule, Rule} from './rschedule';
 
 const getCommonElementsInArrays = <T>(array1: T[], array2: T[]) => {
 	const common: T[] = [];
@@ -15,6 +15,53 @@ const getCommonElementsInArrays = <T>(array1: T[], array2: T[]) => {
 
 const addDuration = (date: Date, ms: number) => new Date(date.getTime() + ms);
 
+const doTwoRulesConflict = (firstRule: Rule, secondRule: Rule) => {
+	if (!firstRule.firstDate?.date || !firstRule.lastDate?.date) {
+		return false;
+	}
+
+	if (!secondRule.firstDate?.date || !secondRule.lastDate?.date) {
+		return false;
+	}
+
+	// If rules occur during completely separate calendar periods
+	if (firstRule.lastDate.date < secondRule.firstDate.date
+			|| secondRule.lastDate.date < firstRule.firstDate.date) {
+		return false;
+	}
+
+	const firstByDayOfWeek = firstRule.options.byDayOfWeek;
+	const secondByDayOfWeek = secondRule.options.byDayOfWeek;
+
+	if (!firstByDayOfWeek || !secondByDayOfWeek) {
+		return false;
+	}
+
+	const firstStart = firstRule.firstDate.date;
+	const firstEnd = addDuration(firstStart, firstRule.duration!);
+	const secondStart = secondRule.firstDate.date;
+	const secondEnd = addDuration(secondStart, secondRule.duration!);
+
+	if (getCommonElementsInArrays(firstByDayOfWeek, secondByDayOfWeek).length > 0) {
+		const compareStartResult = compareTimes(firstStart, secondStart);
+
+		if (compareStartResult === 0) {
+			return true;
+		}
+
+		if (compareStartResult === -1) { // Check if first starts before second
+			// Check if end overlaps
+			if (compareTimes(firstEnd, secondStart) === 1) {
+				return true;
+			}
+		} else if (compareStartResult === 1 // Check if first starts after second
+			// Check if start overlaps
+			&& compareTimes(firstStart, secondEnd) === -1) {
+			return true;
+		}
+	}
+};
+
 const doSchedulesConflict = (firstSchedule: Schedule, secondSchedule: Schedule) => {
 	// There's a much more elegant solution to this using the intersection operator from rSchedule.
 	// However, static analysis is far faster.
@@ -32,49 +79,8 @@ const doSchedulesConflict = (firstSchedule: Schedule, secondSchedule: Schedule)
 	// so O(n^2) shouldn't matter too much. (Famous last words...)
 	for (const currentFirstRuleSetRule of firstRuleSet) {
 		for (const currentSecondRuleSetRule of secondRuleSet) {
-			if (!currentFirstRuleSetRule.firstDate?.date || !currentFirstRuleSetRule.lastDate?.date) {
-				continue;
-			}
-
-			if (!currentSecondRuleSetRule.firstDate?.date || !currentSecondRuleSetRule.lastDate?.date) {
-				continue;
-			}
-
-			// If rules occur during completely separate calendar periods
-			if (currentFirstRuleSetRule.lastDate.date < currentSecondRuleSetRule.firstDate.date
-          || currentSecondRuleSetRule.lastDate.date < currentFirstRuleSetRule.firstDate.date) {
-				continue;
-			}
-
-			const firstByDayOfWeek = currentFirstRuleSetRule.options.byDayOfWeek;
-			const secondByDayOfWeek = currentSecondRuleSetRule.options.byDayOfWeek;
-
-			if (!firstByDayOfWeek || !secondByDayOfWeek) {
-				continue;
-			}
-
-			const firstStart = currentFirstRuleSetRule.firstDate.date;
-			const firstEnd = addDuration(firstStart, currentFirstRuleSetRule.duration!);
-			const secondStart = currentSecondRuleSetRule.firstDate.date;
-			const secondEnd = addDuration(secondStart, currentSecondRuleSetRule.duration!);
-
-			if (getCommonElementsInArrays(firstByDayOfWeek, secondByDayOfWeek).length > 0) {
-				const compareStartResult = compareTimes(firstStart, secondStart);
-
-				if (compareStartResult === 0) {
-					return true;
-				}
-
-				if (compareStartResult === -1) { // Check if first starts before second
-					// Check if end overlaps
-					if (compareTimes(firstEnd, secondStart) === 1) {
-						return true;
-					}
-				} else if (compareStartResult === 1 // Check if first starts after second
-          // Check if start overlaps
-          && compareTimes(firstStart, secondEnd) === -1) {
-					return true;
-				}
+			if (doTwoRulesConflict(currentFirstRuleSetRule, currentSecondRuleSetRule)) {
+				return true;
 			}
 		}
 	}
diff --git a/src/lib/parse-credits-filter.ts b/src/lib/parse-credits-filter.ts
new file mode 100644
index 0000000..9faced6
--- /dev/null
+++ b/src/lib/parse-credits-filter.ts
@@ -0,0 +1,21 @@
+const parseCreditsFilter = (value: string) => {
+	let min = 0;
+	let max = 0;
+
+	if (value.includes('-')) {
+		const fragments = value.split('-');
+		min = Number.parseFloat(fragments[0]);
+		max = Number.parseFloat(fragments[1]);
+	} else if (value.includes('+')) {
+		const fragments = value.split('+');
+		min = Number.parseFloat(fragments[0]);
+		max = Number.MAX_SAFE_INTEGER;
+	} else {
+		min = Number.parseFloat(value);
+		max = min;
+	}
+
+	return [min, max];
+};
+
+export default parseCreditsFilter;
diff --git a/src/lib/parse-search-query.ts b/src/lib/parse-search-query.ts
new file mode 100644
index 0000000..ce493e3
--- /dev/null
+++ b/src/lib/parse-search-query.ts
@@ -0,0 +1,45 @@
+import {qualifiers} from './search-filters';
+
+const searchPairExpr = /((\w*):([\w+-.]*))/g;
+const searchPairExprWithAtLeast1Character = /((\w*):([\w+-.]+))/g;
+
+const parseSearchQuery = (query: string) => {
+	const searchPairs: Array<[string, string]> = query.match(searchPairExprWithAtLeast1Character)?.map(s => s.split(':')) as Array<[string, string]> ?? [];
+	const cleanedSearchValue = query
+		.toLowerCase()
+		.replace(searchPairExpr, '')
+		.replace(/[^A-Za-z\d" ]/g, '')
+		.trim()
+		.split(' ')
+		.filter(token => {
+			let includeToken = true;
+			for (const q of qualifiers) {
+				if (q.includes(token)) {
+					includeToken = false;
+				}
+			}
+
+			return includeToken;
+		})
+		.reduce<string[]>((tokens, token) => {
+		// Check if token is of form subjectcrse (i.e. CS1000)
+		if (/([A-z]+)(\d+)/g.test(token)) {
+			const subject = token.match(/[A-z]+/g);
+			const crse = token.match(/\d+/g);
+
+			if (subject && crse) {
+				searchPairs.push(['subject', subject[0]]);
+				tokens.push(crse[0]);
+			}
+		} else {
+			tokens.push(token);
+		}
+
+		return tokens;
+	}, [])
+		.join(' ');
+
+	return {searchPairs, cleanedSearchValue};
+};
+
+export default parseSearchQuery;
diff --git a/src/lib/search-filters.ts b/src/lib/search-filters.ts
index c6ba055..af60194 100644
--- a/src/lib/search-filters.ts
+++ b/src/lib/search-filters.ts
@@ -1,5 +1,6 @@
 import memoizeOne from 'memoize-one';
 import {ELocationType, ICourseFromAPI, ISectionFromAPI, ISectionFromAPIWithSchedule} from './api-types';
+import parseCreditsFilter from './parse-credits-filter';
 
 export const qualifiers = ['subject', 'level', 'has', 'credits', 'id'];
 
@@ -128,21 +129,7 @@ export const filterSection = (
 			}
 
 			case 'credits': {
-				let min = 0;
-				let max = 0;
-
-				if (value.includes('-')) {
-					const fragments = value.split('-');
-					min = Number.parseFloat(fragments[0]);
-					max = Number.parseFloat(fragments[1]);
-				} else if (value.includes('+')) {
-					const fragments = value.split('+');
-					min = Number.parseFloat(fragments[0]);
-					max = Number.MAX_SAFE_INTEGER;
-				} else {
-					min = Number.parseFloat(value);
-					max = min;
-				}
+				const [min, max] = parseCreditsFilter(value);
 
 				if (!Number.isNaN(min) && !Number.isNaN(max)) {
 					for (const possibleCredit of generateArrayFromRange(section.minCredits, section.maxCredits)) {
diff --git a/src/lib/state/api.ts b/src/lib/state/api.ts
index 1946dc7..a1ee9fa 100644
--- a/src/lib/state/api.ts
+++ b/src/lib/state/api.ts
@@ -1,4 +1,4 @@
-import {makeAutoObservable, runInAction} from 'mobx';
+import {makeAutoObservable, reaction, runInAction} from 'mobx';
 import {makePersistable} from 'mobx-persist-store';
 import mergeByProperty from '../merge-by-property';
 import {
@@ -14,11 +14,19 @@ import {
 import {Schedule} from '../rschedule';
 import asyncRequestIdleCallback from '../async-request-idle-callback';
 
-interface ISemesterFilter {
+interface IConcreteSemester {
 	semester: ESemester;
 	year: number;
+	isFuture?: boolean;
 }
 
+interface IVirtualSemester {
+	semester: ESemester;
+	isFuture: true;
+}
+
+export type ISemesterFilter = IConcreteSemester | IVirtualSemester;
+
 type ENDPOINT = 'courses' | 'sections' | 'instructors' | 'transfer-courses' | 'passfaildrop' | 'buildings';
 type DATA_KEYS = 'courses' | 'sections' | 'instructors' | 'transferCourses' | 'passfaildrop' | 'buildings';
 
@@ -31,6 +39,21 @@ const ENDPOINT_TO_KEY: Record<ENDPOINT, DATA_KEYS> = {
 	buildings: 'buildings',
 };
 
+const VIRTUAL_SEMESTERS: IVirtualSemester[] = [
+	{
+		semester: ESemester.SPRING,
+		isFuture: true,
+	},
+	{
+		semester: ESemester.SUMMER,
+		isFuture: true,
+	},
+	{
+		semester: ESemester.FALL,
+		isFuture: true,
+	},
+];
+
 export class APIState {
 	instructors: IInstructorFromAPI[] = [];
 	passfaildrop: IPassFailDropFromAPI = {};
@@ -42,7 +65,7 @@ export class APIState {
 	errors: Error[] = [];
 	lastUpdatedAt: Date | null = null;
 
-	availableSemesters: ISemesterFilter[] = [];
+	availableSemesters: IConcreteSemester[] = [];
 	selectedSemester?: ISemesterFilter;
 
 	singleFetchEndpoints: ENDPOINT[] = [];
@@ -59,6 +82,13 @@ export class APIState {
 			properties: ['selectedSemester'],
 			storage: typeof window === 'undefined' ? undefined : window.localStorage,
 		});
+
+		reaction(
+			() => this.selectedSemester,
+			async () => {
+				await this.revalidate();
+			},
+		);
 	}
 
 	get subjects() {
@@ -202,12 +232,15 @@ export class APIState {
 			FALL: 0.3,
 		};
 
-		return this.availableSemesters.slice().sort((a, b) => (a.year + semesterValueMap[a.semester]) - (b.year + semesterValueMap[b.semester]));
+		return [
+			...this.availableSemesters.slice().sort((a, b) => (a.year + semesterValueMap[a.semester]) - (b.year + semesterValueMap[b.semester])),
+			...VIRTUAL_SEMESTERS,
+		];
 	}
 
 	async getSemesters() {
 		const url = new URL('/semesters', process.env.NEXT_PUBLIC_API_ENDPOINT).toString();
-		const result = await (await fetch(url)).json() as ISemesterFilter[];
+		const result = await (await fetch(url)).json() as IConcreteSemester[];
 
 		runInAction(() => {
 			this.availableSemesters = result;
@@ -319,7 +352,7 @@ export class APIState {
 				const key = ENDPOINT_TO_KEY[path];
 
 				try {
-					const url = new URL(`/${path}`, process.env.NEXT_PUBLIC_API_ENDPOINT);
+					let url = new URL(`/${path}`, process.env.NEXT_PUBLIC_API_ENDPOINT);
 
 					if (['courses', 'sections'].includes(key)) {
 						if (!this.selectedSemester) {
@@ -327,8 +360,19 @@ export class APIState {
 							return;
 						}
 
-						url.searchParams.append('semester', this.selectedSemester.semester);
-						url.searchParams.append('year', this.selectedSemester.year.toString());
+						if (this.selectedSemester.isFuture) {
+							if (key === 'courses') {
+								url = new URL(`/${path}/unique`, process.env.NEXT_PUBLIC_API_ENDPOINT);
+								url.searchParams.append('startYear', (new Date().getFullYear() - 2).toString());
+								url.searchParams.append('semester', this.selectedSemester.semester);
+							} else if (key === 'sections') {
+								successfulHits++;
+								return;
+							}
+						} else {
+							url.searchParams.append('semester', this.selectedSemester.semester);
+							url.searchParams.append('year', this.selectedSemester.year.toString());
+						}
 					}
 
 					const keyLastUpdatedAt = this.keysLastUpdatedAt[key];
diff --git a/src/lib/state/basket.ts b/src/lib/state/basket.ts
index e662ee2..b04bfe1 100644
--- a/src/lib/state/basket.ts
+++ b/src/lib/state/basket.ts
@@ -6,11 +6,14 @@ import doSchedulesConflict from '../do-schedules-conflict';
 import getCreditsString from '../get-credits-str';
 import {ICourseFromAPI, IInstructorFromAPI, ISectionFromAPI, ISectionFromAPIWithSchedule} from '../api-types';
 import requestIdleCallbackGuard from '../request-idle-callback-guard';
+import parseSearchQuery from '../parse-search-query';
+import parseCreditsFilter from '../parse-credits-filter';
 import {APIState} from './api';
 
 export class BasketState {
 	name = 'Basket';
 	sectionIds: Array<ISectionFromAPI['id']> = [];
+	courseIds: Array<ICourseFromAPI['id']> = [];
 	searchQueries: string[] = [];
 	isSectionScheduleCompatibleMap = new Map<ISectionFromAPI['id'], boolean>();
 	private readonly apiState: APIState;
@@ -21,15 +24,17 @@ export class BasketState {
 
 		void makePersistable(this, {
 			name: 'Basket',
-			properties: ['sectionIds', 'searchQueries'],
+			properties: ['sectionIds', 'courseIds', 'searchQueries'],
 			storage: typeof window === 'undefined' ? undefined : window.localStorage,
 		}).then(() => {
 			this.undoRedo = trackUndo(
 				() => ({
 					sectionIds: this.sectionIds,
+					courseIds: this.courseIds,
 					searchQueries: this.searchQueries,
 				}), value => {
 					this.sectionIds = value.sectionIds;
+					this.courseIds = value.courseIds;
 					this.searchQueries = value.searchQueries;
 				});
 		});
@@ -70,8 +75,14 @@ export class BasketState {
 	undoLastAction() {
 		const lastSectionIds = this.sectionIds;
 		const lastSearchQueries = this.searchQueries;
+		const lastCourseIds = this.courseIds;
+
 		this.undoRedo?.undo();
-		if (lastSectionIds !== this.sectionIds || lastSearchQueries !== this.searchQueries) {
+
+		if (
+			lastSectionIds !== this.sectionIds
+			|| lastSearchQueries !== this.searchQueries
+			|| lastCourseIds !== this.courseIds) {
 			return true;
 		}
 
@@ -82,8 +93,14 @@ export class BasketState {
 	redoLastAction() {
 		const lastSectionIds = this.sectionIds;
 		const lastSearchQueries = this.searchQueries;
+		const lastCourseIds = this.courseIds;
+
 		this.undoRedo?.redo();
-		if (lastSectionIds !== this.sectionIds || lastSearchQueries !== this.searchQueries) {
+
+		if (
+			lastSectionIds !== this.sectionIds
+			|| lastSearchQueries !== this.searchQueries
+			|| lastCourseIds !== this.courseIds) {
 			return true;
 		}
 
@@ -115,6 +132,20 @@ export class BasketState {
 		return this.sectionIds.includes(id);
 	}
 
+	addCourse(id: ICourseFromAPI['id']) {
+		if (!this.courseIds.includes(id)) {
+			this.courseIds = [...this.courseIds, id];
+		}
+	}
+
+	removeCourse(id: ICourseFromAPI['id']) {
+		this.courseIds = this.courseIds.filter(i => i !== id);
+	}
+
+	hasCourse(id: ICourseFromAPI['id']) {
+		return this.courseIds.includes(id);
+	}
+
 	get numOfItems() {
 		return this.sectionIds.length + this.searchQueries.length;
 	}
@@ -139,14 +170,61 @@ export class BasketState {
 		}, []);
 	}
 
-	get totalCredits() {
-		let credits = 0;
+	get courses() {
+		return this.courseIds.reduce<ICourseFromAPI[]>((accum, id) => {
+			const course = this.apiState.courseById.get(id);
+
+			if (!course) {
+				return accum;
+			}
+
+			return [...accum, course];
+		}, []);
+	}
+
+	get parsedQueries(): Array<{query: string; credits?: [number, number]}> {
+		return this.searchQueries.map(query => {
+			const {searchPairs} = parseSearchQuery(query);
+			const creditsFilter = searchPairs.find(([token]) => token === 'credits');
+
+			if (creditsFilter) {
+				const [,creditsString] = creditsFilter;
+				const [min, max] = parseCreditsFilter(creditsString);
+
+				if (!Number.isNaN(min) && !Number.isNaN(max)) {
+					return {
+						query,
+						credits: [min, max],
+					};
+				}
+			}
+
+			return {query};
+		});
+	}
+
+	get totalCredits(): [number, number] {
+		let minCredits = 0;
+		let maxCredits = 0;
 
 		for (const section of this.sections) {
-			credits += (section.minCredits + section.maxCredits) / 2;
+			minCredits += section.minCredits;
+			maxCredits += section.maxCredits;
+		}
+
+		for (const course of this.courses) {
+			minCredits += course.credits ?? 0;
+			maxCredits += course.credits ?? 0;
+		}
+
+		for (const {credits: creditsForQuery} of this.parsedQueries) {
+			if (creditsForQuery) {
+				minCredits += creditsForQuery[0];
+				maxCredits += creditsForQuery[1];
+			}
 		}
 
-		return credits;
+		return [minCredits, maxCredits];
 	}
 
 	get sectionsThatConflict() {
diff --git a/src/lib/state/ui.ts b/src/lib/state/ui.ts
index 4e829ce..a78aef7 100644
--- a/src/lib/state/ui.ts
+++ b/src/lib/state/ui.ts
@@ -2,8 +2,9 @@ import {autorun, computed, makeAutoObservable} from 'mobx';
 import lunr from 'lunr';
 import {ArrayMap} from '../arr-map';
 import {ICourseFromAPI, ISectionFromAPI, ISectionFromAPIWithSchedule} from '../api-types';
-import {filterCourse, filterSection, qualifiers} from '../search-filters';
+import {filterCourse, filterSection} from '../search-filters';
 import requestIdleCallbackGuard from '../request-idle-callback-guard';
+import parseSearchQuery from '../parse-search-query';
 import {RootState} from './root';
 
 export type ICourseWithFilteredSections = {
@@ -66,44 +67,7 @@ export class UIState {
 
 	// This looks scary. It is every bit as complex as it looks.
 	get filteredCourses(): ICourseWithFilteredSections[] {
-		// Extract qualifier:token pairs from query
-		const searchPairExpr = /((\w*):([\w+-.]*))/g;
-		const searchPairExprWithAtLeast1Character = /((\w*):([\w+-.]+))/g;
-
-		const searchPairs: Array<[string, string]> = this.searchValue.match(searchPairExprWithAtLeast1Character)?.map(s => s.split(':')) as Array<[string, string]> ?? [];
-		const cleanedSearchValue = this.searchValue
-			.toLowerCase()
-			.replace(searchPairExpr, '')
-			.replace(/[^A-Za-z\d" ]/g, '')
-			.trim()
-			.split(' ')
-			.filter(token => {
-				let includeToken = true;
-				for (const q of qualifiers) {
-					if (q.includes(token)) {
-						includeToken = false;
-					}
-				}
-
-				return includeToken;
-			})
-			.reduce<string[]>((tokens, token) => {
-			// Check if token is of form subjectcrse (i.e. CS1000)
-			if (/([A-z]+)(\d+)/g.test(token)) {
-				const subject = token.match(/[A-z]+/g);
-				const crse = token.match(/\d+/g);
-
-				if (subject && crse) {
-					searchPairs.push(['subject', subject[0]]);
-					tokens.push(crse[0]);
-				}
-			} else {
-				tokens.push(token);
-			}
-
-			return tokens;
-		}, [])
-			.join(' ');
+		const {cleanedSearchValue, searchPairs} = parseSearchQuery(this.searchValue);
 
 		// Keeps track of course IDs that should be included in result set
 		const courseScoresArray: Array<{id: ICourseFromAPI['id']; score: number | string}> = [];
diff --git a/src/lib/to-title-case.ts b/src/lib/to-title-case.ts
new file mode 100644
index 0000000..3fc462c
--- /dev/null
+++ b/src/lib/to-title-case.ts
@@ -0,0 +1,3 @@
+const toTitleCase = (string_: string) => string_.split(' ').map(word => `${word[0].toUpperCase()}${word.slice(1).toLowerCase()}`).join(' ');
+
+export default toTitleCase;
diff --git a/src/pages/about.tsx b/src/pages/about.tsx
index 7d4ceed..8b09273 100644
--- a/src/pages/about.tsx
+++ b/src/pages/about.tsx
@@ -168,6 +168,19 @@ const AboutPage = () => (
 				</Text>
 			</VStack>
 
+			<VStack align="flex-start">
+				<Heading size="md">📝 Notes</Heading>
+
+				<UnorderedList lineHeight="2" stylePosition="inside">
+					<ListItem>
+						All times are in EST and are not adjusted for your current location. If you're in MN and a class section is labeled as starting at 10:00 AM, it would start at 9:00 AM in local time. Generated calendar events are not adjusted either for local time, but because they're based off of UTC will work just fine across timezones (i.e. you can imported a generated calendar in MN before coming up to school and the times will stay consistent).
+					</ListItem>
+					<ListItem>
+						Some courses have wrong "semesters offered" data. This is an issue with Banweb and not this site.
+					</ListItem>
+				</UnorderedList>
+			</VStack>
+
 			<VStack align="flex-start" mb={12}>
 				<Heading size="md">📜 Disclaimer</Heading>
 
diff --git a/src/pages/help/registration-script.tsx b/src/pages/help/registration-script.tsx
index 58ad76e..820fadf 100644
--- a/src/pages/help/registration-script.tsx
+++ b/src/pages/help/registration-script.tsx
@@ -59,7 +59,11 @@ const RegistrationScriptPage = () => {
 	};
 
 	useEffect(() => {
-		apiState.setRecurringFetchEndpoints(['courses', 'sections']);
+		if (apiState.selectedSemester?.isFuture) {
+			apiState.setRecurringFetchEndpoints(['courses']);
+		} else {
+			apiState.setRecurringFetchEndpoints(['courses', 'sections']);
+		}
 
 		return () => {
 			apiState.setRecurringFetchEndpoints([]);
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 13a9013..f92777f 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -205,13 +205,18 @@ const HomePage = () => {
 
 	useEffect(() => {
 		apiState.setSingleFetchEndpoints(['passfaildrop', 'buildings']);
-		apiState.setRecurringFetchEndpoints(['courses', 'instructors', 'sections']);
+
+		if (apiState.selectedSemester?.isFuture) {
+			apiState.setRecurringFetchEndpoints(['courses']);
+		} else {
+			apiState.setRecurringFetchEndpoints(['courses', 'instructors', 'sections']);
+		}
 
 		return () => {
 			apiState.setSingleFetchEndpoints([]);
 			apiState.setRecurringFetchEndpoints([]);
 		};
-	}, [apiState]);
+	}, [apiState.selectedSemester, apiState]);
 
 	return (
 		<>