diff --git a/app/services/stakeholder-best-service.js b/app/services/stakeholder-best-service.js
index d56fc8ada..995a703d7 100644
--- a/app/services/stakeholder-best-service.js
+++ b/app/services/stakeholder-best-service.js
@@ -12,6 +12,9 @@ record has been approved, it will be the most recent version (i.e., have
 If you make changes to the database structure, be sure to update these
 methods as well as the corresponding methods in the stakeholder-service.js.
 
+You can search by max/min lat, lng bounds or by a center and radius(distance),
+with bounds taking precedence.
+
 */
 
 const booleanEitherClause = (columnName, value) => {
@@ -27,13 +30,16 @@ const search = async ({
   latitude,
   longitude,
   distance,
+  maxLat,
+  maxLng,
+  minLat,
+  minLng,
   isInactive,
   verificationStatusId,
   tenantId,
 }) => {
   const locationClause = buildLocationClause(latitude, longitude);
   const categoryClause = buildCTEClause(categoryIds, "");
-
   const sql = `${categoryClause}
     select s.id, s.name, s.address_1, s.address_2, s.city, s.state, s.zip,
     s.phone, s.latitude, s.longitude, s.website,  s.notes,
@@ -69,9 +75,11 @@ const search = async ({
     ${buildLoginSelectsClause()}
     from stakeholder_set as s
     ${buildLoginJoinsClause()}
-    where s.tenant_id = ${tenantId} 
+    where s.tenant_id = ${tenantId}
     ${
-      Number(distance) && locationClause
+      maxLat && maxLng && minLat && minLng
+        ? buildBounds({ maxLat, maxLng, minLat, minLng })
+        : Number(distance) && locationClause
         ? `AND ${locationClause} < ${distance}`
         : ""
     }
@@ -83,7 +91,6 @@ const search = async ({
     }
     order by distance
   `;
-  // console.log(sql);
   let stakeholders = [];
   let categoriesResults = [];
   var stakeholderResult, stakeholder_ids;
@@ -349,6 +356,13 @@ const buildLocationClause = (latitude, longitude) => {
   return locationClause;
 };
 
+const buildBounds = ({ maxLat, maxLng, minLat, minLng }) => {
+  return `
+    AND s.latitude BETWEEN ${minLat} AND ${maxLat}
+    AND s.longitude BETWEEN ${minLng} AND ${maxLng}
+  `;
+};
+
 const buildLoginJoinsClause = () => {
   return `
     left join login L1 on s.created_login_id = L1.id
diff --git a/client/src/App.js b/client/src/App.js
index 7b0e7543d..1fee4acc9 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -4,7 +4,7 @@ import { makeStyles, ThemeProvider } from "@material-ui/core/styles";
 import { Grid } from "@material-ui/core";
 import theme from "theme/materialUI";
 import { logout } from "services/account-service";
-import { tenantId, originCoordinates } from "helpers/Configuration";
+import { tenantId, defaultCoordinates } from "helpers/Configuration";
 
 // Components
 import { UserContext } from "components/user-context";
@@ -75,8 +75,8 @@ function App() {
   const [toast, setToast] = useState({ message: "" });
   const [bgImg, setBgImg] = useState("");
   const [origin, setOrigin] = useState({
-    latitude: originCoordinates.lat,
-    longitude: originCoordinates.lon,
+    latitude: defaultCoordinates.lat,
+    longitude: defaultCoordinates.lon,
   });
 
   useEffect(() => {
@@ -127,8 +127,8 @@ function App() {
         (error) => {
           console.log(`Getting browser location failed: ${error.message}`);
           const userCoordinates = {
-            latitude: originCoordinates.lat,
-            longitude: originCoordinates.lon,
+            latitude: defaultCoordinates.lat,
+            longitude: defaultCoordinates.lon,
           };
           setUserCoordinates(userCoordinates);
         }
@@ -176,7 +176,8 @@ function App() {
               <Route path="/organizations">
                 <Results
                   userCoordinates={userCoordinates}
-                  userSearch={origin}
+                  origin={origin}
+                  setOrigin={setOrigin}
                   setToast={setToast}
                 />
               </Route>
diff --git a/client/src/components/Results/ResultsContainer.js b/client/src/components/Results/ResultsContainer.js
index 9fc6cfe2c..5b019d7ad 100644
--- a/client/src/components/Results/ResultsContainer.js
+++ b/client/src/components/Results/ResultsContainer.js
@@ -5,7 +5,7 @@ import { Grid } from "@material-ui/core";
 import { useOrganizationBests } from "hooks/useOrganizationBests";
 import useCategoryIds from "hooks/useCategoryIds";
 import { isMobile } from "helpers";
-import { originCoordinates } from "helpers/Configuration";
+import { defaultCoordinates } from "helpers/Configuration";
 import { DEFAULT_CATEGORIES } from "constants/stakeholder";
 
 import Filters from "./ResultsFilters";
@@ -25,11 +25,11 @@ const useStyles = makeStyles((theme) => ({
 
 export default function ResultsContainer({
   userCoordinates,
-  userSearch,
+  origin,
+  setOrigin,
   setToast,
 }) {
   // Component state
-  const storage = window.sessionStorage;
   const { data, search } = useOrganizationBests();
   const [sortedData, setSortedData] = useState([]);
   const classes = useStyles();
@@ -38,77 +38,34 @@ export default function ResultsContainer({
   const [isMapView, setIsMapView] = useState(true);
   const mobileView = isMobile();
 
-  const doSelectStakeholder = useCallback((stakeholder) => {
-    if (stakeholder && !mobileView) {
-      setViewport({
-        ...viewport,
-        latitude: stakeholder.latitude,
-        longitude: stakeholder.longitude,
-      });
-    }
-    onSelectStakeholder(stakeholder);
+  const { categoryIds, toggleCategory } = useCategoryIds([]);
+  const [isVerifiedSelected, selectVerified] = useState(false);
+  const [viewport, setViewport] = useState({
+    zoom: defaultCoordinates.zoom,
+    latitude: origin.latitude,
+    longitude: origin.longitude,
+    logoPosition: "top-left",
   });
 
+  const doSelectStakeholder = useCallback(
+    (stakeholder) => {
+      if (stakeholder && !isMobile) {
+        setViewport({
+          ...viewport,
+          latitude: stakeholder.latitude,
+          longitude: stakeholder.longitude,
+        });
+      }
+      onSelectStakeholder(stakeholder);
+    },
+    [viewport, setViewport]
+  );
+
   const switchResultsView = () => {
     doSelectStakeholder();
     setIsMapView(!isMapView);
   };
 
-  const initialCategories = storage.categoryIds
-    ? JSON.parse(storage.categoryIds)
-    : [];
-  const { categoryIds, toggleCategory } = useCategoryIds(initialCategories);
-
-  const initialCoords = {
-    locationName: userSearch
-      ? userSearch.locationName
-      : storage.origin
-      ? JSON.parse(storage.origin).locationName
-      : "",
-    latitude: userSearch
-      ? userSearch.latitude
-      : storage.origin
-      ? JSON.parse(storage.origin).latitude
-      : userCoordinates
-      ? userCoordinates.latitude
-      : originCoordinates.lat,
-    longitude: userSearch
-      ? userSearch.longitude
-      : storage.origin
-      ? JSON.parse(storage.origin).longitude
-      : userCoordinates
-      ? userCoordinates.longitude
-      : originCoordinates.lon,
-  };
-
-  const [radius, setRadius] = useState(
-    storage?.radius ? JSON.parse(storage.radius) : 5
-  );
-  const [origin, setOrigin] = useState(initialCoords);
-  const [isVerifiedSelected, selectVerified] = useState(
-    storage?.verified ? JSON.parse(storage.verified) : false
-  );
-
-  const viewPortHash = {
-    0: 4,
-    1: 13.5,
-    2: 12.5,
-    3: 12,
-    5: 11,
-    10: 10,
-    20: 9,
-    50: 8,
-    100: 7,
-    500: 4.5,
-  };
-
-  const [viewport, setViewport] = useState({
-    zoom: viewPortHash[radius || 0],
-    latitude: origin.latitude || JSON.parse(storage.origin).latitude,
-    longitude: origin.longitude || JSON.parse(storage.origin).longitude,
-    logoPosition: "top-left",
-  });
-
   // Component effects
 
   useEffect(() => {
@@ -135,44 +92,26 @@ export default function ResultsContainer({
     setSortedData(data.sort(sortOrganizations));
   }, [data]);
 
-  useEffect(() => {
-    return () => {
-      sessionStorage.clear();
-    };
-  }, []);
-
   const handleSearch = useCallback(
-    (e, center) => {
+    (e, center, bounds) => {
       if (e) e.preventDefault();
       search({
         latitude:
-          (center && center.lat) ||
-          origin.latitude ||
-          userCoordinates.latitude ||
-          JSON.parse(storage.origin).latitude,
+          (center && center.lat) || origin.latitude || userCoordinates.latitude,
         longitude:
           (center && center.lng) ||
           origin.longitude ||
-          userCoordinates.longitude ||
-          JSON.parse(storage.origin).longitude,
-        radius,
+          userCoordinates.longitude,
         categoryIds: categoryIds.length ? categoryIds : DEFAULT_CATEGORIES,
         isInactive: "either",
         verificationStatusId: 0,
+        bounds,
+        radius: defaultCoordinates.radius,
       });
-      if (origin.locationName && origin.latitude && origin.longitude)
-        storage.origin = JSON.stringify({
-          locationName: origin.locationName,
-          latitude: origin.latitude,
-          longitude: origin.longitude,
-        });
 
-      storage.categoryIds = JSON.stringify(categoryIds);
-      storage.radius = JSON.stringify(radius);
-      storage.verified = JSON.stringify(isVerifiedSelected);
       if (!center)
         setViewport({
-          zoom: viewPortHash[radius || 0],
+          zoom: defaultCoordinates.zoom,
           latitude: origin.latitude,
           longitude: origin.longitude,
         });
@@ -180,29 +119,19 @@ export default function ResultsContainer({
     },
     [
       search,
-      origin.locationName,
       origin.latitude,
       origin.longitude,
       userCoordinates.latitude,
       userCoordinates.longitude,
-      radius,
       categoryIds,
-      isVerifiedSelected,
       setViewport,
       doSelectStakeholder,
-      viewPortHash,
-      storage.categoryIds,
-      storage.radius,
-      storage.verified,
-      storage.origin,
     ]
   );
 
   return (
     <>
       <Filters
-        radius={radius}
-        setRadius={setRadius}
         origin={origin}
         setOrigin={setOrigin}
         toggleCategory={toggleCategory}
@@ -211,9 +140,6 @@ export default function ResultsContainer({
         selectVerified={selectVerified}
         userCoordinates={userCoordinates}
         handleSearch={handleSearch}
-        viewport={viewport}
-        setViewport={setViewport}
-        viewPortHash={viewPortHash}
         isMapView={isMapView}
         switchResultsView={switchResultsView}
       />
@@ -229,8 +155,6 @@ export default function ResultsContainer({
         {(!mobileView || (mobileView && isMapView)) && (
           <Map
             handleSearch={handleSearch}
-            selectedLatitude={initialCoords.latitude}
-            selectedLongitude={initialCoords.longitude}
             viewport={viewport}
             setViewport={setViewport}
             stakeholders={data}
@@ -238,7 +162,6 @@ export default function ResultsContainer({
             selectedStakeholder={selectedStakeholder}
             categoryIds={categoryIds}
             setToast={setToast}
-            search={search}
           />
         )}
       </Grid>
diff --git a/client/src/components/Results/ResultsFilters.js b/client/src/components/Results/ResultsFilters.js
index 48eedbacc..70bf27c93 100644
--- a/client/src/components/Results/ResultsFilters.js
+++ b/client/src/components/Results/ResultsFilters.js
@@ -1,8 +1,9 @@
 import React, { useCallback, useEffect } from "react";
 import PropTypes from "prop-types";
 import { makeStyles } from "@material-ui/core/styles";
-import { Grid, Select, MenuItem, Button, Box } from "@material-ui/core";
+import { Grid, Button, Box } from "@material-ui/core";
 import SearchIcon from "@material-ui/icons/Search";
+import LocationSearchingIcon from "@material-ui/icons/LocationSearching";
 
 import {
   MEAL_PROGRAM_CATEGORY_ID,
@@ -29,30 +30,54 @@ const useStyles = makeStyles((theme) => ({
     position: "sticky",
     top: "48px",
     zIndex: 1,
-    [theme.breakpoints.up("md")]: {
-      justifyContent: "center",
-    },
+    justifyContent: "center",
   },
   inputContainer: {
     display: "flex",
     alignItems: "center",
     width: "100%",
-    [theme.breakpoints.up("md")]: {
-      width: "30rem",
-    },
+    maxWidth: "30rem",
+    margin: "0 0.5rem",
+  },
+  form: {
+    all: "inherit",
+    backgroundColor: "white",
+    borderRadius: "6px",
   },
   searchIcon: {
     width: 32,
     height: 32,
   },
-  submit: {
+  nearbyIcon: {
+    maxWidth: "30px",
+  },
+  nearbySearch: {
     height: "40px",
     minWidth: "25px",
+    padding: 0,
+    marginLeft: "5px",
+    borderRadius: 0,
+    backgroundColor: "white",
+    boxShadow: "none",
+    "& .MuiButton-startIcon": {
+      margin: 0,
+    },
+    "&.Mui-disabled": {
+      opacity: 0.8,
+      backgroundColor: "white",
+    },
+    "&:hover": {
+      boxShadow: "none",
+    },
+  },
+  submit: {
+    height: "40px",
     backgroundColor: "#BCE76D",
     borderRadius: "0 6px 6px 0",
     boxShadow: "none",
     "& .MuiButton-startIcon": {
       marginRight: 0,
+      marginLeft: "3px",
     },
     "&.Mui-disabled": {
       backgroundColor: "#BCE76D",
@@ -62,9 +87,6 @@ const useStyles = makeStyles((theme) => ({
       backgroundColor: "#C7F573",
       boxShadow: "none",
     },
-    [theme.breakpoints.down("sm")]: {
-      marginRight: ".5rem",
-    },
   },
   buttonHolder: {
     display: "flex",
@@ -74,21 +96,14 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
-const distanceInfo = [0, 1, 2, 3, 5, 10, 20, 50, 100, 500];
-
 const ResultsFilters = ({
   handleSearch,
-  viewport,
-  setViewport,
   origin,
   setOrigin,
-  radius,
-  setRadius,
   isVerifiedSelected,
   userCoordinates,
   categoryIds,
   toggleCategory,
-  viewPortHash,
   isMapView,
   switchResultsView,
 }) => {
@@ -107,15 +122,7 @@ const ResultsFilters = ({
   useEffect(() => {
     handleSearch();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [origin, radius, categoryIds, isVerifiedSelected, toggleCategory]);
-
-  const handleDistanceChange = (distance) => {
-    setRadius(distance);
-    setViewport({
-      ...viewport,
-      zoom: viewPortHash[distance],
-    });
-  };
+  }, [origin, categoryIds, isVerifiedSelected, toggleCategory]);
 
   const mobileView = isMobile();
 
@@ -131,34 +138,6 @@ const ResultsFilters = ({
         alignItems="center"
         className={classes.buttonHolder}
       >
-        <Grid item>
-          <Select
-            disableUnderline
-            value={radius}
-            onChange={(e) => handleDistanceChange(e.target.value)}
-            inputProps={{
-              classes: {
-                icon: classes.select,
-              },
-            }}
-            className={classes.select}
-          >
-            <MenuItem key={0} value={0} className={classes.menuItems}>
-              DISTANCE
-            </MenuItem>
-            {distanceInfo.map((distance) => (
-              <MenuItem
-                key={distance}
-                value={distance}
-                className={classes.menuItems}
-              >
-                {distance === 0
-                  ? "(Any)"
-                  : `${distance} MILE${distance > 1 ? "S" : ""}`}
-              </MenuItem>
-            ))}
-          </Select>
-        </Grid>
         <Grid item>
           <Button
             style={{
@@ -229,13 +208,20 @@ const ResultsFilters = ({
         <form
           noValidate
           onSubmit={(e) => handleSearch(e)}
-          style={{ all: "inherit" }}
+          className={classes.form}
         >
           <Search
             userCoordinates={userCoordinates}
             setOrigin={setOrigin}
             origin={origin}
           />
+          <Button
+            onClick={() => setOrigin(userCoordinates)}
+            disabled={!userCoordinates.latitude || !userCoordinates.longitude}
+            variant="contained"
+            className={classes.nearbySearch}
+            startIcon={<LocationSearchingIcon className={classes.nearbyIcon} />}
+          />
           <Button
             type="submit"
             disabled={!origin}
diff --git a/client/src/components/Results/ResultsMap.js b/client/src/components/Results/ResultsMap.js
index dc86047cc..dc71e5d38 100644
--- a/client/src/components/Results/ResultsMap.js
+++ b/client/src/components/Results/ResultsMap.js
@@ -96,8 +96,16 @@ function Map({
 
   const searchArea = () => {
     setShowSearchArea(false);
-    const center = mapRef.current.getMap().getCenter();
-    handleSearch(null, center);
+    const map = mapRef.current.getMap();
+    const center = map.getCenter();
+    const mapBounds = map.getBounds();
+    const bounds = {
+      maxLat: mapBounds._ne.lat,
+      minLat: mapBounds._sw.lat,
+      maxLng: mapBounds._ne.lng,
+      minLng: mapBounds._sw.lng,
+    };
+    handleSearch(null, center, bounds);
   };
 
   const unselectStakeholder = () => {
@@ -194,8 +202,6 @@ function Map({
 Map.propTypes = {
   stakeholders: PropTypes.array,
   categoryIds: PropTypes.arrayOf(PropTypes.number).isRequired,
-  selectedLatitude: PropTypes.number.isRequired,
-  selectedLongitude: PropTypes.number.isRequired,
 };
 
 export default Map;
diff --git a/client/src/components/Search.js b/client/src/components/Search.js
index ffe828e0c..09565607a 100644
--- a/client/src/components/Search.js
+++ b/client/src/components/Search.js
@@ -77,8 +77,6 @@ export default function Search({ userCoordinates, setOrigin, origin }) {
   });
 
   const handleInputChange = (event) => {
-    console.log(event);
-    // if (!event.target.value) return;
     setSelectedPlace(event.target.value);
     updateNewInputValue(event.target.value);
     fetchMapboxResults(event.target.value);
diff --git a/client/src/components/Verification/SearchCriteria.js b/client/src/components/Verification/SearchCriteria.js
index 92a0e945a..6522bbcfc 100644
--- a/client/src/components/Verification/SearchCriteria.js
+++ b/client/src/components/Verification/SearchCriteria.js
@@ -20,7 +20,7 @@ import {
 import RadioTrueFalseEither from "../RadioTrueFalseEither";
 import LocationAutocomplete from "../LocationAutocomplete";
 import AccountAutocomplete from "../AccountAutocomplete";
-import { originCoordinates } from "../../helpers/Configuration";
+import { defaultCoordinates } from "../../helpers/Configuration";
 
 const useStyles = makeStyles((theme) => ({
   card: {
@@ -58,8 +58,10 @@ const SearchCriteria = ({
       : "custom"
   );
 
-  const [customLatitude, setCustomLatitude] = useState(originCoordinates.lat);
-  const [customLongitude, setCustomLongitude] = useState(originCoordinates.lon);
+  const [customLatitude, setCustomLatitude] = useState(defaultCoordinates.lat);
+  const [customLongitude, setCustomLongitude] = useState(
+    defaultCoordinates.lon
+  );
   const [customPlaceName, setCustomPlaceName] = useState("");
 
   useEffect(() => {
diff --git a/client/src/helpers/Configuration.js b/client/src/helpers/Configuration.js
index ff1aa93b6..07e2b3d05 100644
--- a/client/src/helpers/Configuration.js
+++ b/client/src/helpers/Configuration.js
@@ -9,13 +9,13 @@ export const tenantId = (() =>
     ? 2
     : 1)();
 
-export const originCoordinates = (() => {
+export const defaultCoordinates = (() => {
   switch (tenantId) {
     case 3:
-      return { lat: 21.33629, lon: -157.89435 };
+      return { lat: 21.3101548, lon: -157.8428712, zoom: 12, radius: 5 };
     case 2:
-      return { lat: 38.576711, lon: -121.493671 };
+      return { lat: 38.3949164, lon: -122.7287326, zoom: 10, radius: 8 };
     default:
-      return { lat: 34.07872, lon: -118.243328 };
+      return { lat: 34.0354899, lon: -118.2439235, zoom: 12, radius: 5 };
   }
 })();
diff --git a/client/src/hooks/useOrganizationBests.js b/client/src/hooks/useOrganizationBests.js
index d4d8ed82a..0af6773a9 100644
--- a/client/src/hooks/useOrganizationBests.js
+++ b/client/src/hooks/useOrganizationBests.js
@@ -13,6 +13,7 @@ export const useOrganizationBests = () => {
     latitude,
     longitude,
     radius,
+    bounds,
     categoryIds,
     isInactive,
     verificationStatusId,
@@ -27,7 +28,7 @@ export const useOrganizationBests = () => {
     //if (!categoryIds || categoryIds.length === 0) return;
     try {
       setState({ data: null, loading: true, error: false });
-      const stakeholders = await stakeholderService.search({
+      let params = {
         name,
         categoryIds,
         latitude,
@@ -35,7 +36,18 @@ export const useOrganizationBests = () => {
         distance: radius,
         isInactive,
         verificationStatusId,
-      });
+      };
+      if (bounds) {
+        const { maxLat, maxLng, minLat, minLng } = bounds;
+        params = {
+          ...params,
+          maxLng,
+          maxLat,
+          minLng,
+          minLat,
+        };
+      }
+      const stakeholders = await stakeholderService.search(params);
       setState({ data: stakeholders, loading: false, error: false });
       return stakeholders;
     } catch (err) {
diff --git a/client/src/services/stakeholder-best-service.js b/client/src/services/stakeholder-best-service.js
index a6ad373ac..de7009d02 100644
--- a/client/src/services/stakeholder-best-service.js
+++ b/client/src/services/stakeholder-best-service.js
@@ -14,6 +14,10 @@ const toLocalMoment = (ts) => {
         categoryIds - array of integers corresponding to the desired categories
         latitude
         longitude
+        maxLat - optional
+        maxLng - optional
+        minLat - optional
+        minLng - optional
         distance - radius around latitude and longitude
         isAssigned - ("yes", "no", "either")
         isSubmitted - ("yes", "no", "either")