diff --git a/CITATION.cff b/CITATION.cff
index 9d03408dc..756b15b6c 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -75,5 +75,5 @@ keywords:
   - Software Impact
   - Software Reuse
 license: Apache-2.0
-version: v1.9.0
-date-released: '2022-10-28'
+version: v1.10.0
+date-released: '2022-11-04'
diff --git a/authentication/README.md b/authentication/README.md
index ac5cb1ce0..b4b395d73 100644
--- a/authentication/README.md
+++ b/authentication/README.md
@@ -1,5 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <e.cahen@esciencecenter.nl>
+SPDX-FileCopyrightText: 2022 Netherlands eScience Center
 SPDX-FileCopyrightText: 2022 dv4all
 
 SPDX-License-Identifier: CC-BY-4.0
@@ -7,24 +9,24 @@ SPDX-License-Identifier: CC-BY-4.0
 
 # Authentication module
 
-This modules handles authentication from third parties using oAuth2 and OpenID.
+This module handles authentication from third parties using oAuth2 and OpenID.
 
 ## Environment variables
+Check `.env.example` to see which environment variables are needed. 
+
+## Developing locally
+If you want to develop and run the auth module locally, i.e. outside of Docker, you have to make two changes to files tracked by Git.
+1. In `docker-compose.yml`, add the following lines to the `nginx` service:
+```yml
+extra_hosts:
+  - "host.docker.internal:host-gateway"
+```
+2. In `nginx.conf`, replace `server auth:7000;` with `server host.docker.internal:7000;`
 
-It requires the following variables at run time.
-
-```env
-# connection to backend
-POSTGREST_URL=
-
-# SURFconext
-NEXT_PUBLIC_SURFCONEXT_CLIENT_ID=
-NEXT_PUBLIC_SURFCONEXT_REDIRECT=
-AUTH_SURFCONEXT_CLIENT_SECRET=
+Remember to undo these changes before committing!
 
-# JWT secret for postgREST
-PGRST_JWT_SECRET=
-```
+It is recommended to use the [envFile plugin](https://plugins.jetbrains.com/plugin/7861-envfile)  of IntelliJ IDEA to load your `.env` file.
+Furthermore, set the value of `POSTGREST_URL` to `http://localhost/api/v1`.
 
 ## Running the tests
 
diff --git a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java
index d89184275..0a0c817cb 100644
--- a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java
+++ b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/Main.java
@@ -12,15 +12,14 @@
 import com.auth0.jwt.exceptions.JWTVerificationException;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
-import io.javalin.http.ForbiddenResponse;
-import io.javalin.http.RedirectResponse;
 
 import java.util.Base64;
 
 public class Main {
 	static final long ONE_HOUR_IN_SECONDS = 3600; // 60 * 60
+	static final long ONE_MINUTE_IN_SECONDS = 60;
 
-	public static boolean userIsAllowed (OpenIdInfo info) {
+	public static boolean userIsAllowed(OpenIdInfo info) {
 		String whitelist = Config.userMailWhitelist();
 
 		if (whitelist == null || whitelist.length() == 0) {
@@ -28,15 +27,13 @@ public static boolean userIsAllowed (OpenIdInfo info) {
 			return true;
 		}
 
-		if (
-			info == null || info.email() == null || info.email().length() == 0
-		) {
+		if (info == null || info.email() == null || info.email().length() == 0) {
 			throw new Error("Unexpected parameters for 'userIsAllowed'");
 		}
 
 		String[] allowed = whitelist.split(";");
 
-		for (String s: allowed) {
+		for (String s : allowed) {
 			if (s.equalsIgnoreCase(info.email())) {
 				return true;
 			}
@@ -54,83 +51,63 @@ public static void main(String[] args) {
 			System.out.println("Warning: local accounts are enabled, this is not safe for production!");
 			System.out.println("********************");
 			app.post("/login/local", ctx -> {
-				try {
-					String sub = ctx.formParam("sub");
-					if (sub == null || sub.isBlank()) throw new RuntimeException("Please provide a username");
-					String name = sub;
-					String email = sub + "@example.com";
-					String organisation = "Example organisation";
-					OpenIdInfo localInfo = new OpenIdInfo(sub, name, email, organisation);
-
-					AccountInfo accountInfo = new PostgrestAccount().account(localInfo, OpenidProvider.local);
-					boolean isAdmin = isAdmin(email);
-					createAndSetToken(ctx, accountInfo, isAdmin);
-				} catch (RuntimeException ex) {
-					ex.printStackTrace();
-					ctx.redirect("/login/failed");
-				}
+				String sub = ctx.formParam("sub");
+				if (sub == null || sub.isBlank()) throw new RuntimeException("Please provide a username");
+				String name = sub;
+				String email = sub + "@example.com";
+				String organisation = "Example organisation";
+				OpenIdInfo localInfo = new OpenIdInfo(sub, name, email, organisation);
+
+				AccountInfo accountInfo = new PostgrestAccount().account(localInfo, OpenidProvider.local);
+				boolean isAdmin = isAdmin(email);
+				createAndSetToken(ctx, accountInfo, isAdmin);
 			});
 		}
 
 		if (Config.isSurfConextEnabled()) {
 			app.post("/login/surfconext", ctx -> {
-				try {
-					String code = ctx.formParam("code");
-					String redirectUrl = Config.surfconextRedirect();
-					OpenIdInfo surfconextInfo = new SurfconextLogin(code, redirectUrl).openidInfo();
-
-					if (!userIsAllowed(surfconextInfo)) {
-						throw new RuntimeException("User is not whitelisted");
-					}
-
-					AccountInfo accountInfo = new PostgrestAccount().account(surfconextInfo, OpenidProvider.surfconext);
-					String email = surfconextInfo.email();
-					boolean isAdmin = isAdmin(email);
-					createAndSetToken(ctx, accountInfo, isAdmin);
-				} catch (RuntimeException ex) {
-					ex.printStackTrace();
-					ctx.redirect("/login/failed");
+				String code = ctx.formParam("code");
+				String redirectUrl = Config.surfconextRedirect();
+				OpenIdInfo surfconextInfo = new SurfconextLogin(code, redirectUrl).openidInfo();
+
+				if (!userIsAllowed(surfconextInfo)) {
+					throw new RsdAuthenticationException("Your email address (" + surfconextInfo.email() + ") is not whitelisted.");
 				}
+
+				AccountInfo accountInfo = new PostgrestAccount().account(surfconextInfo, OpenidProvider.surfconext);
+				String email = surfconextInfo.email();
+				boolean isAdmin = isAdmin(email);
+				createAndSetToken(ctx, accountInfo, isAdmin);
 			});
 		}
 
 		if (Config.isHelmholtzEnabled()) {
 			app.get("/login/helmholtzaai", ctx -> {
-				try {
-					String code = ctx.queryParam("code");
-					String redirectUrl = Config.helmholtzAaiRedirect();
-					OpenIdInfo helmholtzInfo = new HelmholtzAaiLogin(code, redirectUrl).openidInfo();
-
-					if (!userIsAllowed(helmholtzInfo)) {
-						throw new RuntimeException("User is not whitelisted");
-					}
-
-					AccountInfo accountInfo = new PostgrestAccount().account(helmholtzInfo, OpenidProvider.helmholtz);
-					String email = helmholtzInfo.email();
-					boolean isAdmin = isAdmin(email);
-					createAndSetToken(ctx, accountInfo, isAdmin);
-				} catch (RuntimeException ex) {
-					ex.printStackTrace();
-					ctx.redirect("/login/failed");
+				String code = ctx.queryParam("code");
+				String redirectUrl = Config.helmholtzAaiRedirect();
+				OpenIdInfo helmholtzInfo = new HelmholtzAaiLogin(code, redirectUrl).openidInfo();
+
+				if (!userIsAllowed(helmholtzInfo)) {
+					throw new RsdAuthenticationException("Your email address (" + helmholtzInfo.email() + ") is not whitelisted.");
 				}
+
+				AccountInfo accountInfo = new PostgrestAccount().account(helmholtzInfo, OpenidProvider.helmholtz);
+				String email = helmholtzInfo.email();
+				boolean isAdmin = isAdmin(email);
+				createAndSetToken(ctx, accountInfo, isAdmin);
 			});
 		}
 
 		if (Config.isOrcidEnabled()) {
 			app.get("/login/orcid", ctx -> {
-				try {
-					String code = ctx.queryParam("code");
-					String redirectUrl = Config.orcidRedirect();
-					OpenIdInfo orcidInfo = new OrcidLogin(code, redirectUrl).openidInfo();
-
-					AccountInfo accountInfo = new PostgrestCheckOrcidWhitelistedAccount(new PostgrestAccount()).account(orcidInfo, OpenidProvider.orcid);
-					String email = orcidInfo.email();
-					boolean isAdmin = isAdmin(email);
-					createAndSetToken(ctx, accountInfo, isAdmin);
-				} catch (RuntimeException ex) {
-					ex.printStackTrace();
-					ctx.redirect("/login/failed");
-				}
+				String code = ctx.queryParam("code");
+				String redirectUrl = Config.orcidRedirect();
+				OpenIdInfo orcidInfo = new OrcidLogin(code, redirectUrl).openidInfo();
+
+				AccountInfo accountInfo = new PostgrestCheckOrcidWhitelistedAccount(new PostgrestAccount()).account(orcidInfo, OpenidProvider.orcid);
+				String email = orcidInfo.email();
+				boolean isAdmin = isAdmin(email);
+				createAndSetToken(ctx, accountInfo, isAdmin);
 			});
 		}
 
@@ -156,6 +133,17 @@ public static void main(String[] args) {
 			ctx.status(400);
 			ctx.json("{\"message\": \"invalid JWT\"}");
 		});
+
+		app.exception(RsdAuthenticationException.class, (ex, ctx) -> {
+			setLoginFailureCookie(ctx, ex.getMessage());
+			ctx.redirect("/login/failed");
+		});
+
+		app.exception(RuntimeException.class, (ex, ctx) -> {
+			ex.printStackTrace();
+			setLoginFailureCookie(ctx, "Something unexpected went wrong, please try again or contact us.");
+			ctx.redirect("/login/failed");
+		});
 	}
 
 	static boolean isAdmin(String email) {
@@ -173,6 +161,10 @@ static void setJwtCookie(Context ctx, String token) {
 		ctx.header("Set-Cookie", "rsd_token=" + token + "; Secure; HttpOnly; Path=/; SameSite=Lax; Max-Age=" + ONE_HOUR_IN_SECONDS);
 	}
 
+	static void setLoginFailureCookie(Context ctx, String message) {
+		ctx.header("Set-Cookie", "rsd_login_failure_message=" + message + "; Secure; Path=/login/failed; SameSite=Lax; Max-Age=" + ONE_MINUTE_IN_SECONDS);
+	}
+
 	static void setRedirectFromCookie(Context ctx) {
 		String returnPath = ctx.cookie("rsd_pathname");
 		if (returnPath != null && !returnPath.isBlank()) {
diff --git a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/PostgrestCheckOrcidWhitelistedAccount.java b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/PostgrestCheckOrcidWhitelistedAccount.java
index add611047..c74efdbef 100644
--- a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/PostgrestCheckOrcidWhitelistedAccount.java
+++ b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/PostgrestCheckOrcidWhitelistedAccount.java
@@ -37,7 +37,7 @@ public AccountInfo account(OpenIdInfo openIdInfo, OpenidProvider provider) {
 		JwtCreator jwtCreator = new JwtCreator(Config.jwtSigningSecret());
 		String token = jwtCreator.createAdminJwt();
 		String response = PostgrestAccount.getAsAdmin(queryUri, token);
-		if (!orcidInResponse(orcid, response)) throw new AuthenticationException("Your ORCID (" + orcid + ") is not whitelisted.");
+		if (!orcidInResponse(orcid, response)) throw new RsdAuthenticationException("Your ORCID (" + orcid + ") is not whitelisted.");
 
 		return origin.account(openIdInfo, provider);
 	}
diff --git a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/AuthenticationException.java b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/RsdAuthenticationException.java
similarity index 69%
rename from authentication/src/main/java/nl/esciencecenter/rsd/authentication/AuthenticationException.java
rename to authentication/src/main/java/nl/esciencecenter/rsd/authentication/RsdAuthenticationException.java
index 767e1246c..19dc29af1 100644
--- a/authentication/src/main/java/nl/esciencecenter/rsd/authentication/AuthenticationException.java
+++ b/authentication/src/main/java/nl/esciencecenter/rsd/authentication/RsdAuthenticationException.java
@@ -5,9 +5,9 @@
 
 package nl.esciencecenter.rsd.authentication;
 
-public class AuthenticationException extends RuntimeException {
+public class RsdAuthenticationException extends RuntimeException {
 
-	public AuthenticationException(String message) {
+	public RsdAuthenticationException(String message) {
 		super(message);
 	}
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 7788561da..d07ba5a30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -92,7 +92,7 @@ services:
       # dockerfile to use for build
       dockerfile: Dockerfile
     # update version number to correspond to frontend/package.json
-    image: rsd/frontend:1.6.6
+    image: rsd/frontend:1.9.1
     environment:
       # it uses values from .env file
       - POSTGREST_URL
@@ -202,7 +202,7 @@ services:
         - DUID
         - DGID
     # update version number to correspond to frontend/package.json
-    image: rsd/frontend-dev:1.6.4
+    image: rsd/frontend-dev:1.9.1
     ports:
       - "3000:3000"
       - "9229:9229"
diff --git a/frontend/auth/locationCookie.ts b/frontend/auth/locationCookie.ts
index acda30d17..7c33302fd 100644
--- a/frontend/auth/locationCookie.ts
+++ b/frontend/auth/locationCookie.ts
@@ -17,6 +17,7 @@ export function saveLocationCookie() {
     case '/login':
     case '/logout':
     case '/login/local':
+    case '/login/failed':
       break
     case '/':
       // root is send to /software
diff --git a/frontend/components/feedback/FeedbackPanelButton.tsx b/frontend/components/feedback/FeedbackPanelButton.tsx
index 4e834a25f..601e6bb09 100644
--- a/frontend/components/feedback/FeedbackPanelButton.tsx
+++ b/frontend/components/feedback/FeedbackPanelButton.tsx
@@ -11,7 +11,7 @@ import Divider from '@mui/material/Divider'
 import getBrowser from '~/utils/getBrowser'
 
 export default function FeedbackPanelButton(
-  {feedback_email, issues_page_url, closeFeedbackPanel}: { feedback_email: string, issues_page_url:string, closeFeedbackPanel?: () => void }
+  {feedback_email, issues_page_url, closeFeedbackPanel}: {feedback_email: string, issues_page_url:string, closeFeedbackPanel?: () => void }
 ) {
 
   const [text, setText] = useState('')
diff --git a/frontend/components/form/AsyncAutocompleteSC.tsx b/frontend/components/form/AsyncAutocompleteSC.tsx
index 2ac1a8e79..8abef415f 100644
--- a/frontend/components/form/AsyncAutocompleteSC.tsx
+++ b/frontend/components/form/AsyncAutocompleteSC.tsx
@@ -144,7 +144,14 @@ export default function AsyncAutocompleteSC<T>({status, options, config,
       // because search text is usually not identical to selected item
       // we ignore onInputChange event when reason==='reset'
       setInputValue(newInputValue)
-
+      // if user removes all input and onClear is provided
+      // we trigger on clear event. In addition, in freeSolo
+      // the icon is present that activates reason===clear
+      if (reason === 'input' && newInputValue === '' && onClear) {
+        // console.log('Call on clear event')
+        // issue clear attempt
+        onClear()
+      }
       // we start new search if processing
       // is not empty we should reset it??
       if (processing !== '') {
diff --git a/frontend/components/keyword/FindKeyword.test.tsx b/frontend/components/keyword/FindKeyword.test.tsx
index 99ec5fc11..4c1848199 100644
--- a/frontend/components/keyword/FindKeyword.test.tsx
+++ b/frontend/components/keyword/FindKeyword.test.tsx
@@ -31,6 +31,10 @@ const props = {
   onCreate:mockCreate
 }
 
+afterEach(() => {
+  jest.runOnlyPendingTimers()
+  // jest.useRealTimers()
+})
 
 // this test needs to be first to return mocked non-resolving promise
 it('calls seach Fn and renders the loader', async () => {
@@ -54,9 +58,9 @@ it('calls seach Fn and renders the loader', async () => {
   })
 
   await waitFor(() => {
-    // validate that searchFn is called once
-    expect(mockSearch).toHaveBeenCalledTimes(1)
-    // is called with seachFor term
+    // validate that searchFn is called twice (first on load then on search)
+    expect(mockSearch).toHaveBeenCalledTimes(2)
+    // last called with seachFor term
     expect(mockSearch).toHaveBeenCalledWith({searchFor})
     // check if loader is present
     const loader = screen.getByTestId('circular-loader')
@@ -80,8 +84,10 @@ it('renders component with label, help and input with role comobox', () => {
 it('offer Add option when search has no results', async() => {
   // prepare
   jest.useFakeTimers()
-  // resolve with no options
-  mockSearch.mockResolvedValueOnce([])
+  // resolve with no options twice (on load and on search)
+  mockSearch
+    .mockResolvedValueOnce([])
+    .mockResolvedValueOnce([])
   // render component
   render(<FindKeyword {...props} />)
 
@@ -113,11 +119,15 @@ it('DOES NOT offer Add option when search return result that match', async () =>
   const searchFor = 'test'
   const searchCnt = 123
   // resolve with no options
-  mockSearch.mockResolvedValueOnce([{
-    id: '123123',
-    keyword: searchFor,
-    cnt: searchCnt
-  }])
+  mockSearch
+    // intial call on load
+    .mockResolvedValueOnce([])
+    // search call
+    .mockResolvedValueOnce([{
+      id: '123123',
+      keyword: searchFor,
+      cnt: searchCnt
+    }])
 
   // render component
   render(<FindKeyword {...props} />)
@@ -152,7 +162,10 @@ it('calls onCreate method with string value to add new option', async() => {
   // prepare
   jest.useFakeTimers()
   // resolve with no options
-  mockSearch.mockResolvedValueOnce([])
+  mockSearch
+    // intial call on load
+    .mockResolvedValueOnce([])
+    .mockResolvedValueOnce([])
   // render component
   render(<FindKeyword {...props} />)
 
@@ -192,7 +205,11 @@ it('calls onAdd method to add option to selection', async() => {
     cnt: searchCnt
   }
   // resolve with no options
-  mockSearch.mockResolvedValueOnce([mockOption])
+  mockSearch
+    // intial call on load
+    .mockResolvedValueOnce([])
+    // search call
+    .mockResolvedValueOnce([mockOption])
   // render component
   render(<FindKeyword {...props} />)
 
diff --git a/frontend/components/keyword/FindKeyword.tsx b/frontend/components/keyword/FindKeyword.tsx
index 63c43a77d..f70b18aa8 100644
--- a/frontend/components/keyword/FindKeyword.tsx
+++ b/frontend/components/keyword/FindKeyword.tsx
@@ -5,7 +5,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-import {HTMLAttributes, useState} from 'react'
+import {HTMLAttributes, useEffect, useState} from 'react'
 
 import AsyncAutocompleteSC, {AsyncAutocompleteConfig, AutocompleteOption} from '~/components/form/AsyncAutocompleteSC'
 
@@ -23,19 +23,44 @@ type FindKeywordProps = {
 }
 
 export default function FindKeyword({config, onAdd, searchForKeyword, onCreate}: FindKeywordProps) {
+  const [initalList, setInitalList] = useState<AutocompleteOption<Keyword>[]>([])
   const [options, setOptions] = useState<AutocompleteOption<Keyword>[]>([])
   const [status, setStatus] = useState<{
     loading: boolean,
+    searchFor: string | undefined
     foundFor: string | undefined
   }>({
     loading: false,
+    searchFor: undefined,
     foundFor: undefined
   })
 
+  useEffect(() => {
+    async function getInitalList() {
+      const resp = await searchForKeyword({
+        // we trim raw search value
+        searchFor: ''
+      })
+      // convert keywords to autocomplete options
+      const options = resp.map(item => ({
+        key: item.keyword,
+        label: item.keyword,
+        data: item
+      }))
+      // debugger
+      // set options
+      setOptions(options)
+      setInitalList(options)
+    }
+    getInitalList()
+  // ignore linter for searchForKeyword fn
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
   async function searchKeyword(searchFor: string) {
     // console.log('searchKeyword...searchFor...', searchFor)
     // set loading status and clear foundFor
-    setStatus({loading: true, foundFor: undefined})
+    setStatus({loading: true, searchFor, foundFor: undefined})
     // make search request
     const resp = await searchForKeyword({
       // we trim raw search value
@@ -54,6 +79,7 @@ export default function FindKeyword({config, onAdd, searchForKeyword, onCreate}:
     // stop loading
     setStatus({
       loading: false,
+      searchFor,
       foundFor: searchFor
     })
   }
@@ -61,6 +87,11 @@ export default function FindKeyword({config, onAdd, searchForKeyword, onCreate}:
   function onAddKeyword(selected:AutocompleteOption<Keyword>) {
     if (selected && selected.data) {
       onAdd(selected.data)
+      // if we use reset of selected input
+      // we also load inital list of keywords
+      if (config.reset === true) {
+        setOptions(initalList)
+      }
     }
   }
 
@@ -118,6 +149,7 @@ export default function FindKeyword({config, onAdd, searchForKeyword, onCreate}:
         onAdd={onAddKeyword}
         onCreate={createKeyword}
         onRenderOption={renderOption}
+        onClear={()=>setOptions(initalList)}
         config={{
           ...config,
           // freeSolo allows create option
diff --git a/frontend/components/keyword/KeywordFilter.tsx b/frontend/components/keyword/KeywordFilter.tsx
index 794698fc3..56d74c218 100644
--- a/frontend/components/keyword/KeywordFilter.tsx
+++ b/frontend/components/keyword/KeywordFilter.tsx
@@ -11,12 +11,13 @@ import Divider from '@mui/material/Divider'
 import Button from '@mui/material/Button'
 import FilterAltIcon from '@mui/icons-material/FilterAlt'
 import CloseIcon from '@mui/icons-material/Close'
+import DeleteIcon from '@mui/icons-material/Delete'
 import Popover from '@mui/material/Popover'
 import Chip from '@mui/material/Chip'
-import PlayArrowIcon from '@mui/icons-material/PlayArrow'
+import Alert from '@mui/material/Alert'
+import AlertTitle from '@mui/material/AlertTitle'
 
 import FindKeyword, {Keyword} from '~/components/keyword/FindKeyword'
-import Alert from '@mui/material/Alert'
 
 type SeachApiProps = {
   searchFor: string
@@ -42,7 +43,6 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
   // console.log('open...', open)
   // console.groupEnd()
 
-
   function handleOpen(event: React.MouseEvent<HTMLElement>){
     setAnchorEl(event.currentTarget)
   }
@@ -56,17 +56,14 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
     handleClose()
   }
 
-  function handleApply(){
-    onApply(selectedItems)
-    handleClose()
-  }
-
   function handleDelete(pos:number) {
     const newList = [
       ...selectedItems.slice(0, pos),
       ...selectedItems.slice(pos+1)
     ]
     setSelectedItems(newList)
+    // apply directly
+    onApply(newList)
   }
 
   function onAdd(item: Keyword) {
@@ -78,6 +75,8 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
         item.keyword
       ].sort()
       setSelectedItems(newList)
+      // apply directly
+      onApply(newList)
     }
   }
 
@@ -92,8 +91,10 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
                   <span className="text-md">+</span>
                   <Chip
                     label={item}
-                    size="small"
                     onDelete={() => handleDelete(pos)}
+                    sx={{
+                      borderRadius:'0.25rem'
+                    }}
                   />
                 </Fragment>
               )
@@ -102,8 +103,10 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
               <Chip
                 key={pos}
                 label={item}
-                size="small"
                 onDelete={() => handleDelete(pos)}
+                sx={{
+                  borderRadius:'0.25rem'
+                }}
               />
             )
           })}
@@ -111,10 +114,11 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
       )
     }
     // debugger
+    // return null
     return (
-      <Alert severity="info" sx={{marginTop: '0.5rem'}}>
-        {/* <AlertTitle sx={{fontWeight: 500}}>No keywords to filter.</AlertTitle> */}
-        Add keyword <strong>by typing</strong> in the Find keyword.
+      <Alert severity="info" sx={{margin: '1rem'}}>
+        <AlertTitle sx={{fontWeight: 500}}>Filter is not active</AlertTitle>
+        Select a keyword from the list or <strong>start typing</strong>.
       </Alert>
     )
   }
@@ -122,21 +126,29 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
   return (
     <>
       <Tooltip title={`Filter: ${selectedItems.length>0 ? selectedItems.join(' + ') : 'None'}`}>
-        <IconButton onClick={handleOpen}>
+        <IconButton
+          onClick={handleOpen}
+          sx={{marginRight:'0.5rem'}}
+        >
           <Badge badgeContent={selectedItems.length} color="primary">
             <FilterAltIcon />
           </Badge>
         </IconButton>
       </Tooltip>
       <Popover
+        // anchorReference="anchorPosition"
+        // anchorPosition={{top: 0, left: 0}}
         anchorEl={anchorEl}
         open={open}
         onClose={handleClose}
         // align menu to the right from the menu button
-        transformOrigin={{horizontal: 'right', vertical: 'top'}}
-        anchorOrigin={{horizontal: 'right', vertical: 'bottom'}}
+        transformOrigin={{horizontal: 'center', vertical: 'top'}}
+        anchorOrigin={{horizontal: 'center', vertical: 'bottom'}}
         sx={{
-          maxWidth:'24rem'
+          display: 'flex',
+          flexDirection: 'column',
+          width: ['100vw', '24rem'],
+          height: ['100vh', 'auto']
         }}
       >
         <h3 className="px-4 py-3 text-primary">
@@ -147,8 +159,8 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
           <FindKeyword
             config={{
               freeSolo: false,
-              minLength: 1,
-              label: 'Find keyword',
+              minLength: 0,
+              label: 'Select or type a keyword',
               help: '',
               reset: true
             }}
@@ -162,16 +174,19 @@ export default function KeywordsFilter({items=[], searchApi, onApply}:KeywordFil
         <div className="flex items-center justify-between px-4 py-2">
           <Button
             color="secondary"
-            startIcon={<CloseIcon />}
-            onClick={handleClear}>
-            {selectedItems.length === 0 ? 'Close' : 'Clear'}
+            startIcon={<DeleteIcon />}
+            onClick={handleClear}
+            disabled={selectedItems.length===0}
+          >
+
+            {/* {selectedItems.length === 0 ? 'Close' : 'Clear'} */}
+            Clear
           </Button>
           <Button
-            onClick={handleApply}
-            startIcon={<PlayArrowIcon />}
-            disabled={selectedItems.length===0}
+            onClick={handleClose}
+            startIcon={<CloseIcon />}
           >
-            Apply
+            Close
           </Button>
         </div>
       </Popover>
diff --git a/frontend/components/login/LoginButton.tsx b/frontend/components/login/LoginButton.tsx
index 91bc955dd..855680809 100644
--- a/frontend/components/login/LoginButton.tsx
+++ b/frontend/components/login/LoginButton.tsx
@@ -10,17 +10,13 @@
 
 import {useState} from 'react'
 import Link from 'next/link'
-import Dialog from '@mui/material/Dialog'
-import DialogContent from '@mui/material/DialogContent'
-import DialogTitle from '@mui/material/DialogTitle'
-import useMediaQuery from '@mui/material/useMediaQuery'
 import {useTheme} from '@mui/material/styles'
 
 import {useAuth} from '~/auth'
 import useLoginProviders from '~/auth/api/useLoginProviders'
 import {getUserMenuItems} from '~/config/userMenuItems'
 import UserMenu from '~/components/layout/UserMenu'
-import CaretIcon from '~/components/icons/caret.svg'
+import LoginDialog from './LoginDialog'
 
 export default function LoginButton() {
   const providers = useLoginProviders()
@@ -28,9 +24,8 @@ export default function LoginButton() {
   const status = session?.status || 'loading'
   const [open, setOpen] = useState(false)
   const theme = useTheme()
-  const fullScreen = useMediaQuery(theme.breakpoints.down('md'))
 
-  /* Sign in dialog */
+  /* LoginDialog */
   const handleClickOpen = () => { setOpen(true) }
   const handleClose = () => { setOpen(false) }
 
@@ -57,37 +52,11 @@ export default function LoginButton() {
         <button onClick={handleClickOpen} tabIndex={0} className="rsd-login-buton">
           Sign in
         </button>
-        <Dialog
-          fullScreen={fullScreen}
+        <LoginDialog
+          providers={providers}
           open={open}
           onClose={handleClose}
-          aria-labelledby="responsive-dialog-title"
-        >
-          <DialogTitle id="responsive-dialog-title">
-            Sign in with
-          </DialogTitle>
-
-          <DialogContent>
-            <span className="italic text-gray-600">
-              Somewhere, something incredible is waiting to be known.
-            </span> <br/> Carl Sagan
-            <div className="flex flex-col gap-3 my-8">
-            {providers.map(provider => {
-              return (
-                <Link
-                  key={provider.redirectUrl}
-                  href={provider.redirectUrl}
-                  passHref
-                >
-                  <a className=" w-full hover:bg-black hover:text-primary-content transition font-bold py-2 px-4 rounded-full border outline-1">
-                    {provider.name}
-                  </a>
-                </Link>
-              )
-            })}
-            </div>
-          </DialogContent>
-        </Dialog>
+        />
       </div>
     )
   }
diff --git a/frontend/components/login/LoginDialog.tsx b/frontend/components/login/LoginDialog.tsx
new file mode 100644
index 000000000..79a03b6d3
--- /dev/null
+++ b/frontend/components/login/LoginDialog.tsx
@@ -0,0 +1,103 @@
+import Link from 'next/link'
+
+import Dialog from '@mui/material/Dialog'
+import DialogContent from '@mui/material/DialogContent'
+import DialogTitle from '@mui/material/DialogTitle'
+import useMediaQuery from '@mui/material/useMediaQuery'
+import {useTheme} from '@mui/material/styles'
+import List from '@mui/material/List'
+import ListItem from '@mui/material/ListItem'
+import ListItemText from '@mui/material/ListItemText'
+import CloseIcon from '@mui/icons-material/Close'
+import IconButton from '@mui/material/IconButton'
+
+import {Provider} from 'pages/api/fe/auth'
+import useRsdSettings from '~/config/useRsdSettings'
+
+type LoginDialogProps = {
+  providers: Provider[]
+  open:boolean,
+  onClose:()=>void
+}
+
+export default function LoginDialog({providers,open, onClose}: LoginDialogProps) {
+  const {host} = useRsdSettings()
+  const theme = useTheme()
+  const fullScreen = useMediaQuery(theme.breakpoints.down('md'))
+
+  return (
+    <Dialog
+      fullScreen={fullScreen}
+      open={open}
+      onClose={onClose}
+    >
+      <DialogTitle
+        id="responsive-dialog-title"
+        aria-labelledby="responsive-dialog-title"
+        sx={{
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent:'space-between',
+          fontSize: '1.75rem'
+        }}
+      >
+        Sign in with
+        <IconButton onClick={onClose}>
+          <CloseIcon />
+        </IconButton>
+      </DialogTitle>
+      <DialogContent>
+        <>
+          <List>
+            {providers.map(provider => {
+              return (
+                <Link
+                  key={provider.redirectUrl}
+                  href={provider.redirectUrl}
+                  passHref
+                >
+                <a>
+                  <ListItem
+                    alignItems="flex-start"
+                    className="rounded-[0.25rem] border outline-1 my-2"
+                    sx={{
+                      opacity: 0.75,
+                      '&:hover': {
+                        opacity: 1,
+                        backgroundColor:'background.default'
+                      }
+                    }}
+                  >
+                    <ListItemText
+                      primary={provider.name}
+                      secondary={provider?.html ?
+                        <span
+                          dangerouslySetInnerHTML={{__html: provider.html}}
+                        />
+                        : null
+                      }
+                      sx={{
+                        '.MuiListItemText-primary': {
+                          color:'primary.main',
+                          fontSize: '1.5rem',
+                          fontWeight: 700,
+                          letterSpacing: '0.125rem'
+                        }
+                      }}
+                    />
+                  </ListItem>
+                </a>
+                </Link>
+              )
+            })}
+          </List>
+          {host.login_info_url &&
+            <p className="text-base-content-disabled text-sm">
+              You can find more information on signing in to the RSD in our <a href={host.login_info_url} target="_blank" rel="noreferrer"><strong>documentation</strong></a>.
+            </p>
+          }
+        </>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/frontend/components/mention/FindMention.test.tsx b/frontend/components/mention/FindMention.test.tsx
index 2ee0c4a90..d3e85ba0a 100644
--- a/frontend/components/mention/FindMention.test.tsx
+++ b/frontend/components/mention/FindMention.test.tsx
@@ -39,6 +39,11 @@ let props:FindMentionProps = {
 
 jest.useFakeTimers()
 
+afterEach(() => {
+  jest.runOnlyPendingTimers()
+  // jest.useRealTimers()
+})
+
 it('has working cancel button when freeSolo', async () => {
   props.config.freeSolo=true
   const searchFor = 'test string'
@@ -230,3 +235,4 @@ it('removes input after selection when reset=true', async () => {
   // exper input to be reset
   expect(searchInput).toHaveValue('')
 })
+
diff --git a/frontend/components/organisation/metadata/Links.tsx b/frontend/components/organisation/metadata/Links.tsx
new file mode 100644
index 000000000..6bac70a22
--- /dev/null
+++ b/frontend/components/organisation/metadata/Links.tsx
@@ -0,0 +1,47 @@
+import Link from 'next/link'
+import UnderlinedTitle from './UnderlinedTitle'
+
+export type LinksProps = {
+  title: string,
+  url: string
+  icon: JSX.Element,
+}
+
+export default function Links({links=[]}:{links:LinksProps[]}) {
+  try {
+    if (links.length === 0) return null
+
+    return (
+      <>
+        <UnderlinedTitle title='Links' />
+        <ul>
+        {links.map(item => {
+          return (
+            <li
+              key={item.url}
+              style={{
+                overflow: 'hidden',
+                textOverflow: 'ellipsis',
+                whiteSpace: 'nowrap',
+                margin: '0.5rem 0rem'
+              }}
+            >
+            <Link
+              key={item.url}
+              href={item.url}
+              passHref
+            >
+              <a target="_blank">
+                {item.icon} {item.title}
+              </a>
+            </Link>
+            </li>
+          )
+        })}
+        </ul>
+      </>
+    )
+  } catch (e) {
+    return null
+  }
+}
diff --git a/frontend/components/organisation/metadata/RorLocation.tsx b/frontend/components/organisation/metadata/RorLocation.tsx
new file mode 100644
index 000000000..c613bda15
--- /dev/null
+++ b/frontend/components/organisation/metadata/RorLocation.tsx
@@ -0,0 +1,44 @@
+import Link from 'next/link'
+import PlaceIcon from '@mui/icons-material/Place'
+import {RORItem} from '~/utils/getROR'
+import UnderlinedTitle from './UnderlinedTitle'
+
+export default function RorLocation({meta}: { meta: RORItem | null }) {
+  try {
+    if (meta===null) return null
+    const location = meta.addresses[0]
+    if (location) {
+      const country = meta.country.country_name
+      const {lng,lat} = location
+      if (lng && lat) {
+        const query = encodeURIComponent(`${meta.name},${location.city},${country}`)
+        return (
+          <>
+            <UnderlinedTitle title='Location' />
+            <Link
+              href={`https://www.google.com/maps/search/?api=1&query=${query}`}
+              passHref
+            >
+            <a target="_blank">
+              <div className="flex gap-2">
+                <PlaceIcon sx={{
+                  width: '1.5rem',
+                  height: '1.5rem'
+                }} />
+                <div>
+                  <div>{meta.name}</div>
+                  <div>{location.city}, {country}</div>
+                </div>
+              </div>
+            </a>
+            </Link>
+          </>
+        )
+      }
+      return null
+    }
+    return null
+  } catch (e) {
+    return null
+  }
+}
diff --git a/frontend/components/organisation/metadata/RorType.tsx b/frontend/components/organisation/metadata/RorType.tsx
new file mode 100644
index 000000000..9629c67e0
--- /dev/null
+++ b/frontend/components/organisation/metadata/RorType.tsx
@@ -0,0 +1,33 @@
+import Chip from '@mui/material/Chip'
+import {RORItem} from '~/utils/getROR'
+import UnderlinedTitle from './UnderlinedTitle'
+
+export default function RorType({meta}:{meta:RORItem|null}) {
+  try {
+    if (meta===null) return null
+    return (
+      <>
+        <UnderlinedTitle title='Type' />
+        <div className="flex gap-4 mb-4">
+          {meta.types.map(item => (
+            <Chip
+            key={item}
+            label={item}
+            sx={{
+              maxWidth: '19rem',
+              borderRadius: '0rem 0.5rem',
+              backgroundColor: 'primary.main',
+              color: 'primary.contrastText',
+              textTransform: 'uppercase',
+              letterSpacing: '0.125rem',
+              fontSize:'0.75rem'
+            }}
+          />
+        ))}
+        </div>
+      </>
+    )
+  } catch (e) {
+    return null
+  }
+}
diff --git a/frontend/components/organisation/metadata/UnderlinedTitle.tsx b/frontend/components/organisation/metadata/UnderlinedTitle.tsx
new file mode 100644
index 000000000..e4f13ddf4
--- /dev/null
+++ b/frontend/components/organisation/metadata/UnderlinedTitle.tsx
@@ -0,0 +1,8 @@
+export default function UnderlinedTitle({title}:{title: string}) {
+  return (
+    <>
+      <h4 className="pt-2 text-base-content-disabled">{title}</h4>
+      <hr className="pb-2" />
+    </>
+  )
+}
diff --git a/frontend/components/organisation/metadata/index.tsx b/frontend/components/organisation/metadata/index.tsx
index 11aa38c16..df3191d45 100644
--- a/frontend/components/organisation/metadata/index.tsx
+++ b/frontend/components/organisation/metadata/index.tsx
@@ -1,9 +1,12 @@
-import Link from 'next/link'
 import {RORItem} from '~/utils/getROR'
 import OrganisationLogo from './OrganisationLogo'
-import PlaceIcon from '@mui/icons-material/Place'
-import Chip from '@mui/material/Chip'
 import {OrganisationForOverview} from '~/types/Organisation'
+import RorType from './RorType'
+import Links, {LinksProps} from './Links'
+import RorLocation from './RorLocation'
+import LanguageIcon from '@mui/icons-material/Language'
+import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'
+import AutoStoriesIcon from '@mui/icons-material/AutoStories'
 
 type OrgnisationInfoProps = {
   organisation: OrganisationForOverview,
@@ -11,167 +14,42 @@ type OrgnisationInfoProps = {
   isMaintainer: boolean
 }
 
-export function UnderlinedTitle({title}:{title: string}) {
-  return (
-    <>
-      <h4 className="pt-2 text-base-content-disabled">{title}</h4>
-      <hr className="pb-2" />
-    </>
-  )
-}
-
-export function RorLocation({meta}: { meta: RORItem | null }) {
-  try {
-    if (meta===null) return null
-    const location = meta.addresses[0]
-    if (location) {
-      const country = meta.country.country_name
-      const {lng,lat} = location
-      if (lng && lat) {
-        const query = encodeURIComponent(`${meta.name},${location.city},${country}`)
-        return (
-          <>
-            <UnderlinedTitle title='Location' />
-            <Link
-              href={`https://www.google.com/maps/search/?api=1&query=${query}`}
-              passHref
-            >
-            <a target="_blank">
-              <div className="flex gap-2">
-                <PlaceIcon sx={{
-                  width: '1.5rem',
-                  height:'1.5rem'
-                }} />
-                <div>
-                  <div>{meta.name}</div>
-                  <div>{location.city}, {country}</div>
-                </div>
-              </div>
-            </a>
-            </Link>
-          </>
-        )
-      }
-      return null
-    }
-    return null
-  } catch (e) {
-    return null
-  }
-}
-
-export function Links({links=[]}:{links:string[]}) {
-  try {
-    if (links.length===0) return null
-    return (
-      <>
-        <UnderlinedTitle title='Links' />
-        {links.map(item => (
-          <Link
-            key={item}
-            href={item}
-            passHref
-          >
-            <a target="_blank">
-              <div
-                title={item}
-                style={{
-                  overflow: 'hidden',
-                  textOverflow: 'ellipsis',
-                  whiteSpace: 'nowrap'
-                }}>{item}</div>
-            </a>
-          </Link>
-        ))}
-      </>
-    )
-  } catch (e) {
-    return null
-  }
-}
-
-export function RorTypes({meta}:{meta:RORItem|null}) {
-  try {
-    if (meta===null) return null
-    return (
-      <>
-        <UnderlinedTitle title='Type' />
-        <div className="flex">
-          {meta.types.map(item => (
-            <Chip
-            key={item}
-            title={item}
-            label={item}
-            sx={{
-              marginBottom: '1rem',
-              marginRight: '0.5rem',
-              maxWidth: '19rem',
-              borderRadius: '0rem 0.5rem',
-              backgroundColor: 'primary.main',
-              color: 'primary.contrastText',
-              textTransform: 'uppercase',
-              letterSpacing: '0.125rem'
-            }}
-          />
-        ))}
-        </div>
-      </>
-    )
-  } catch (e) {
-    return null
-  }
-}
-
-
 export default function OrganisationMetadata({organisation, meta, isMaintainer}: OrgnisationInfoProps) {
 
   function getAllLinks() {
-    const links:string[] = []
+    const rsdLinks:LinksProps[]=[]
     if (organisation.website) {
       // website as first link
-      links.push(organisation.website)
-    }
-    if (meta && meta.links) {
-      meta.links.forEach(item => {
-        // add only new items
-        if (links.indexOf(item) === -1) {
-          links.push(item)
-        }
+      rsdLinks.push({
+        title: 'Website',
+        url: organisation.website,
+        icon: <LanguageIcon />,
+      })
+    } else if (meta && meta.links && meta.links.length > 0) {
+      rsdLinks.push({
+        title: 'Website',
+        url: meta.links[0],
+        icon: <LanguageIcon />,
       })
     }
     // meta.id is ror_id url
-    if (meta && meta.id && links.indexOf(meta.id) === -1) {
+    if (meta && meta.id) {
       // add only new items
-      links.push(meta.id)
+      rsdLinks.push({
+        title:'ROR info',
+        url: meta.id,
+        icon: <InfoOutlinedIcon />,
+      })
     }
     // some organisations provide wikipedia page
-    if (meta && meta?.wikipedia_url && links.indexOf(meta?.wikipedia_url) === -1) {
-      links.push(meta?.wikipedia_url)
-    }
-    return links
-  }
-
-  function renderInfo() {
-    // if no metadata but website is provided
-    if (meta === null && organisation.website) {
-      // we return one link
-      return (
-        <Links links={[organisation.website]} />
-      )
-    } else if (meta) {
-      // if ror_id is valid (meta is present) we
-      // merge all links from meta and organisation.website
-      const links = getAllLinks()
-      return (
-        <>
-          <RorTypes meta={meta} />
-          <RorLocation meta={meta} />
-          <Links links={links} />
-        </>
-      )
+    if (meta && meta?.wikipedia_url) {
+      rsdLinks.push({
+        title:'Wikipedia',
+        url: meta?.wikipedia_url,
+        icon: <AutoStoriesIcon />,
+      })
     }
-    // if no meta and no website we return nothing
-    return null
+    return rsdLinks
   }
 
   return (
@@ -184,7 +62,9 @@ export default function OrganisationMetadata({organisation, meta, isMaintainer}:
         isMaintainer={isMaintainer}
         {...organisation}
       />
-      {renderInfo()}
+      <RorType meta={meta} />
+      <RorLocation meta={meta} />
+      <Links links={getAllLinks()} />
     </div>
   )
 }
diff --git a/frontend/components/organisation/metadata/useOrganisationMetadata.ts b/frontend/components/organisation/metadata/useOrganisationMetadata.ts
deleted file mode 100644
index 3e7048680..000000000
--- a/frontend/components/organisation/metadata/useOrganisationMetadata.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {useEffect, useState} from 'react'
-import {getOrganisationMetadata, RORItem} from '~/utils/getROR'
-
-export function useOrganisationmMetadata(ror_id: string|null) {
-  const [meta, setMeta] = useState <RORItem|null>(null)
-  const [loading, setLoading] = useState(true)
-
-  useEffect(() => {
-    async function getMeta() {
-      const resp = await getOrganisationMetadata(ror_id)
-      setMeta(resp)
-      setLoading(false)
-    }
-    if (ror_id) {
-      getMeta()
-    }
-  },[ror_id])
-
-  return {
-    meta,
-    loading
-  }
-}
diff --git a/frontend/components/organisation/project/index.tsx b/frontend/components/organisation/project/index.tsx
index 6ceb00850..898f20239 100644
--- a/frontend/components/organisation/project/index.tsx
+++ b/frontend/components/organisation/project/index.tsx
@@ -17,7 +17,7 @@ import {OrganisationComponentsProps} from '../OrganisationNavItems'
 
 export default function OrganisationProjects({organisation, isMaintainer}:OrganisationComponentsProps) {
   const {token} = useSession()
-  const {searchFor,page,rows,setCount} = usePaginationWithSearch('Filter projects')
+  const {searchFor,page,rows,setCount} = usePaginationWithSearch(`Find project in ${organisation.name}`)
   const {loading, projects, count} = useOrganisationProjects({
     organisation: organisation.id,
     searchFor,
diff --git a/frontend/components/organisation/software/index.tsx b/frontend/components/organisation/software/index.tsx
index 3597c70fc..b783d7061 100644
--- a/frontend/components/organisation/software/index.tsx
+++ b/frontend/components/organisation/software/index.tsx
@@ -17,7 +17,7 @@ import SoftwareCardWithMenu from './SoftwareCardWithMenu'
 
 export default function OrganisationSoftware({organisation, isMaintainer}: OrganisationComponentsProps) {
   const {token} = useSession()
-  const {searchFor,page,rows,setCount} = usePaginationWithSearch('Filter software')
+  const {searchFor,page,rows,setCount} = usePaginationWithSearch(`Find software in ${organisation.name}`)
   const {loading, software, count} = useOrganisationSoftware({
     organisation: organisation.id,
     searchFor,
diff --git a/frontend/components/projects/edit/information/config.ts b/frontend/components/projects/edit/information/config.ts
index b84efbe0d..7a14ee0b2 100644
--- a/frontend/components/projects/edit/information/config.ts
+++ b/frontend/components/projects/edit/information/config.ts
@@ -86,7 +86,7 @@ export const projectInformation = {
     title: 'Keywords',
     subtitle: 'How to find this project?',
     label: 'Find or add keyword',
-    help: 'Start typing for the suggestions',
+    help: 'Select from top 30 list or start typing for the suggestions',
     validation: {
       //custom validation rule, not in used by react-hook-form
       minLength: 1,
diff --git a/frontend/components/projects/edit/information/searchForKeyword.ts b/frontend/components/projects/edit/information/searchForKeyword.ts
index e87d2e304..e23a69853 100644
--- a/frontend/components/projects/edit/information/searchForKeyword.ts
+++ b/frontend/components/projects/edit/information/searchForKeyword.ts
@@ -20,8 +20,8 @@ export type NewKeyword = {
 export async function searchForProjectKeyword({searchFor}:
   { searchFor: string }) {
   try {
-    // GET top 50 matches
-    const url = `/api/v1/rpc/keyword_count_for_projects?keyword=ilike.*${searchFor}*&order=keyword.asc&limit=50`
+    // GET top 30 matches
+    const url = `/api/v1/rpc/keyword_count_for_projects?keyword=ilike.*${searchFor}*&order=cnt.desc.nullslast,keyword.asc&limit=30`
     const resp = await fetch(url, {
       method: 'GET'
     })
diff --git a/frontend/components/software/CommitsChart.tsx b/frontend/components/software/CommitsChart.tsx
index 099825ff8..89b808ac4 100644
--- a/frontend/components/software/CommitsChart.tsx
+++ b/frontend/components/software/CommitsChart.tsx
@@ -38,7 +38,7 @@ export default function CommitsChart({repository_url, commit_history, commit_his
   // ELSE if no commit history we show graph placeholder with the message
   let noCommitMessage: string | undefined
   if (typeof repository_url === 'undefined' || repository_url === null) {
-    noCommitMessage = 'We cannot scrape the commit history because repository url is missing.'
+    noCommitMessage = 'We cannot display the activity graph, because we do not know the repository url.'
   } else if (typeof commit_history_scraped_at === 'undefined' || commit_history_scraped_at === null) {
     // not scraped yet
     noCommitMessage = 'We did not scrape the commit history of this repository yet.'
diff --git a/frontend/components/software/SoftwareKeywordFilter.tsx b/frontend/components/software/SoftwareKeywordFilter.tsx
index 13b8ce516..3f959991a 100644
--- a/frontend/components/software/SoftwareKeywordFilter.tsx
+++ b/frontend/components/software/SoftwareKeywordFilter.tsx
@@ -15,7 +15,7 @@ type KeywordFilterProps = {
  * Keywords filter component. It receives array of keywords and returns
  * array of selected tags to use in filter using onSelect callback function
  */
-export default function SoftwareKeywordsFilter({items=[], onApply}:KeywordFilterProps) {
+export default function SoftwareKeywordsFilter({items = [], onApply}: KeywordFilterProps) {
   return (
     <KeywordFilter
       items={items}
diff --git a/frontend/components/software/SoftwareKeywords.tsx b/frontend/components/software/SoftwareKeywords.tsx
index 8487d4936..4f6f43174 100644
--- a/frontend/components/software/SoftwareKeywords.tsx
+++ b/frontend/components/software/SoftwareKeywords.tsx
@@ -6,7 +6,7 @@
 import LocalOfferIcon from '@mui/icons-material/LocalOffer'
 import {KeywordForSoftware} from '../../types/SoftwareTypes'
 import TagChipFilter from '../layout/TagChipFilter'
-import {softwareUrl} from '~/utils/postgrestUrl'
+import {ssrSoftwareUrl} from '~/utils/postgrestUrl'
 
 export default function SoftwareKeywords({keywords = []}: { keywords: KeywordForSoftware[] }) {
 
@@ -19,7 +19,7 @@ export default function SoftwareKeywords({keywords = []}: { keywords: KeywordFor
     return (
       <div className="flex flex-wrap gap-2 py-1">
         {keywords.map((item, pos) => {
-          const url = softwareUrl({keywords: [item.keyword]})
+          const url = ssrSoftwareUrl({keywords: [item.keyword]})
           return <TagChipFilter url={url} key={pos} label={item.keyword} />
         })}
       </div>
diff --git a/frontend/components/software/edit/editSoftwareConfig.tsx b/frontend/components/software/edit/editSoftwareConfig.tsx
index fb0d2cc52..fd15223dc 100644
--- a/frontend/components/software/edit/editSoftwareConfig.tsx
+++ b/frontend/components/software/edit/editSoftwareConfig.tsx
@@ -123,7 +123,7 @@ export const softwareInformation = {
     title: 'Keywords',
     subtitle: 'Find, add or import using concept DOI.',
     label: 'Find or add keyword',
-    help: 'Start typing for the suggestions',
+    help: 'Select from top 30 list or start typing for the suggestions',
     validation: {
       //custom validation rule, not in used by react-hook-form
       minLength: 1,
diff --git a/frontend/components/software/edit/information/searchForSoftwareKeyword.ts b/frontend/components/software/edit/information/searchForSoftwareKeyword.ts
index 8a0af6c88..f888b7929 100644
--- a/frontend/components/software/edit/information/searchForSoftwareKeyword.ts
+++ b/frontend/components/software/edit/information/searchForSoftwareKeyword.ts
@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {Keyword} from '~/components/keyword/FindKeyword'
+import {getBaseUrl} from '~/utils/fetchHelpers'
 import logger from '../../../../utils/logger'
 
 
@@ -15,9 +16,9 @@ export async function searchForSoftwareKeyword(
 ) {
   try {
     const searchForEncoded = encodeURIComponent(searchFor)
-
-    // GET top 20 matches
-    const url = `/api/v1/rpc/keyword_count_for_software?keyword=ilike.*${searchForEncoded}*&order=keyword.asc&limit=20`
+    const baseUrl = getBaseUrl()
+    // GET top 30 matches
+    const url = `${baseUrl}/rpc/keyword_count_for_software?keyword=ilike.*${searchForEncoded}*&order=cnt.desc.nullslast,keyword.asc&limit=30`
     const resp = await fetch(url, {
       method: 'GET'
     })
diff --git a/frontend/config/rsdSettingsReducer.ts b/frontend/config/rsdSettingsReducer.ts
index bbffd14e8..9abb31e53 100644
--- a/frontend/config/rsdSettingsReducer.ts
+++ b/frontend/config/rsdSettingsReducer.ts
@@ -25,6 +25,7 @@ export type RsdHost = {
     url: string,
     issues_page_url: string
   },
+  login_info_url?:string
 }
 
 export type CustomLink = {
diff --git a/frontend/package.json b/frontend/package.json
index 52700a03d..bbc204919 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rsd-frontend",
-  "version": "1.6.4",
+  "version": "1.9.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
diff --git a/frontend/pages/api/fe/auth/helmholtzaai.ts b/frontend/pages/api/fe/auth/helmholtzaai.ts
index f9ae2f061..fee968822 100644
--- a/frontend/pages/api/fe/auth/helmholtzaai.ts
+++ b/frontend/pages/api/fe/auth/helmholtzaai.ts
@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2022 Christian Meeßen (GFZ) <christian.meessen@gfz-potsdam.de>
 // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
 // SPDX-FileCopyrightText: 2022 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences
 // SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) <matthias.ruester@gfz-potsdam.de>
@@ -57,7 +58,10 @@ export async function helmholtzInfo() {
     // provide redirectUrl and name/label
     return {
       name: 'Helmholtz AAI',
-      redirectUrl
+      redirectUrl,
+      html: `
+        Sign in with Helmholtz AAI is enabled for all members of the <strong>Helmholtz Research Foundation</strong>.
+      `
     }
   }
   return null
diff --git a/frontend/pages/api/fe/auth/index.ts b/frontend/pages/api/fe/auth/index.ts
index f876afb05..7047c9fc9 100644
--- a/frontend/pages/api/fe/auth/index.ts
+++ b/frontend/pages/api/fe/auth/index.ts
@@ -28,7 +28,8 @@ export type ApiError = {
 
 export type Provider = {
   name: string,
-  redirectUrl:string
+  redirectUrl: string,
+  html?: string
 }
 
 type Data = Provider[] | ApiError
diff --git a/frontend/pages/api/fe/auth/local.ts b/frontend/pages/api/fe/auth/local.ts
index 0c5f1c971..b6e56dce0 100644
--- a/frontend/pages/api/fe/auth/local.ts
+++ b/frontend/pages/api/fe/auth/local.ts
@@ -6,6 +6,10 @@
 export function localInfo() {
   return {
     name: 'Local account',
-    redirectUrl: '/login/local'
+    redirectUrl: '/login/local',
+    html: `
+      <p>Sign in with local account is <strong>for testing purposes only</strong>.
+      This option should not be enabled in the production version.</p>
+    `
   }
 }
diff --git a/frontend/pages/api/fe/auth/orcid.ts b/frontend/pages/api/fe/auth/orcid.ts
index 5a37895a4..82bf76136 100644
--- a/frontend/pages/api/fe/auth/orcid.ts
+++ b/frontend/pages/api/fe/auth/orcid.ts
@@ -58,7 +58,11 @@ export async function orcidInfo() {
     // provide redirectUrl and name/label
     return {
       name: 'ORCID',
-      redirectUrl
+      redirectUrl,
+      html: `
+        Sign in with ORCID is supported <strong>only for persons invited by the RSD administrators</strong>.
+        <strong><a href="mailto:rsd@esciencecenter.nl?subject=${encodeURIComponent('Login with ORCID')}" target="_blank">Contact us</a></strong> if you wish to login with your ORCID.
+      `
     }
   }
   return null
diff --git a/frontend/pages/api/fe/auth/surfconext.ts b/frontend/pages/api/fe/auth/surfconext.ts
index 69394e7b6..84b9c00c5 100644
--- a/frontend/pages/api/fe/auth/surfconext.ts
+++ b/frontend/pages/api/fe/auth/surfconext.ts
@@ -58,7 +58,11 @@ export async function surfconextInfo() {
     // provide redirectUrl and name/label
     return {
       name: 'SURFconext',
-      redirectUrl
+      redirectUrl,
+      html: `<p>Sign in with SURFconext is for <strong>Dutch Institutions who enabled the 
+      RSD service</strong> in the <a href="https://dashboard.surfconext.nl/apps/9514/oidc10_rp/about" target = "_new">
+      SURFconext IdP dashboard</a>.
+      </p>`
     }
   }
   return null
diff --git a/frontend/pages/login/failed.tsx b/frontend/pages/login/failed.tsx
index f47f1cf5f..faddc92d8 100644
--- a/frontend/pages/login/failed.tsx
+++ b/frontend/pages/login/failed.tsx
@@ -1,13 +1,29 @@
 // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
-// SPDX-FileCopyrightText: 2022 dv4all
+// SPDX-FileCopyrightText: 2022 Ewan Cahen (Netherlands eScience Center) <e.cahen@esciencecenter.nl>
 // SPDX-FileCopyrightText: 2022 Helmholtz Centre for Environmental Research (UFZ)
+// SPDX-FileCopyrightText: 2022 Netherlands eScience Center
+// SPDX-FileCopyrightText: 2022 dv4all
 //
 // SPDX-License-Identifier: Apache-2.0
 
 import Link from 'next/link'
 import ContentInTheMiddle from '../../components/layout/ContentInTheMiddle'
+import {useEffect} from 'react'
+import {useState} from 'react'
 
 export default function LoginFailed() {
+  const [errorMessage, setErrorMessage] = useState<string>()
+
+  useEffect(() => {
+    const errorCookie = document.cookie.split(';')
+      .find(cookie => cookie.trim().startsWith('rsd_login_failure_message='))
+
+    if (errorCookie) {
+      setErrorMessage(errorCookie.replace('rsd_login_failure_message=', ''))
+      document.cookie = 'rsd_login_failure_message=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/login/failed; SameSite=Lax'
+    }
+  }, [])
+
   return (
     <ContentInTheMiddle>
       <div className="border p-12">
@@ -15,8 +31,11 @@ export default function LoginFailed() {
         <p className="py-8">
           Unfortunately, something went wrong during the login process.
         </p>
+        {errorMessage && <p className="pb-8 text-error">
+          {errorMessage}
+        </p>}
         <Link href="/" passHref>
-          <a>Go home</a>
+          <a>Return to home page</a>
           </Link>
       </div>
     </ContentInTheMiddle>
diff --git a/frontend/pages/organisations/index.tsx b/frontend/pages/organisations/index.tsx
index 3a7256185..3cd518e67 100644
--- a/frontend/pages/organisations/index.tsx
+++ b/frontend/pages/organisations/index.tsx
@@ -92,7 +92,7 @@ export default function OrganisationsIndexPage({
         <div className="md:flex flex-wrap justify-end">
           <div className="flex items-center lg:ml-4">
             <Searchbox
-              placeholder='Filter organisations'
+              placeholder='Find organisation'
               onSearch={handleSearch}
               defaultValue={search}
             />
diff --git a/frontend/pages/projects/index.tsx b/frontend/pages/projects/index.tsx
index 5c354eea2..2daa56550 100644
--- a/frontend/pages/projects/index.tsx
+++ b/frontend/pages/projects/index.tsx
@@ -109,15 +109,15 @@ export default function ProjectsIndexPage(
       <PageTitle title="Projects">
         <div className="md:flex flex-wrap justify-end">
           <div className="flex items-center lg:ml-4">
-            <Searchbox
-              placeholder="Filter projects"
-              onSearch={handleSearch}
-              defaultValue={search}
-            />
             <ProjectKeywordFilter
               items={keywords ?? []}
               onApply={handleFilters}
             />
+            <Searchbox
+              placeholder={keywords?.length ? 'Find within selection' : 'Find project'}
+              onSearch={handleSearch}
+              defaultValue={search}
+            />
           </div>
           <TablePagination
             component="nav"
@@ -171,6 +171,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
     offset: rows * page,
   })
 
+  // console.log('projects...url...', url)
   // get project list, we do not pass the token
   // when token is passed it will return not published items too
   const projects = await getProjectList({url})
diff --git a/frontend/pages/software/index.tsx b/frontend/pages/software/index.tsx
index cd50dae4b..54b5d6ab5 100644
--- a/frontend/pages/software/index.tsx
+++ b/frontend/pages/software/index.tsx
@@ -20,7 +20,7 @@ import {SoftwareListItem} from '../../types/SoftwareTypes'
 import {rowsPerPageOptions} from '../../config/pagination'
 import {getSoftwareList} from '../../utils/getSoftware'
 import {ssrSoftwareParams} from '../../utils/extractQueryParam'
-import {softwareListUrl,softwareUrl} from '../../utils/postgrestUrl'
+import {softwareListUrl,ssrSoftwareUrl} from '../../utils/postgrestUrl'
 import SoftwareKeywordFilter from '~/components/software/SoftwareKeywordFilter'
 
 type SoftwareIndexPageProps = {
@@ -49,7 +49,7 @@ export default function SoftwareIndexPage(
     event: MouseEvent<HTMLButtonElement> | null,
     newPage: number,
   ) {
-    const url = softwareUrl({
+    const url = ssrSoftwareUrl({
       // take existing params from url (query)
       ...ssrSoftwareParams(router.query),
       page: newPage,
@@ -69,7 +69,7 @@ export default function SoftwareIndexPage(
   function handleItemsPerPage(
     event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ){
-    const url = softwareUrl({
+    const url = ssrSoftwareUrl({
       // take existing params from url (query)
       ...ssrSoftwareParams(router.query),
       // reset to first page
@@ -81,7 +81,7 @@ export default function SoftwareIndexPage(
 
   function handleSearch(searchFor: string) {
     // debugger
-    const url = softwareUrl({
+    const url = ssrSoftwareUrl({
       // take existing params from url (query)
       ...ssrSoftwareParams(router.query),
       search: searchFor,
@@ -92,7 +92,7 @@ export default function SoftwareIndexPage(
   }
 
   function handleFilters(keywords: string[]){
-    const url = softwareUrl({
+    const url = ssrSoftwareUrl({
       // take existing params from url (query)
       ...ssrSoftwareParams(router.query),
       keywords,
@@ -115,15 +115,15 @@ export default function SoftwareIndexPage(
       <PageTitle title="Software">
         <div className="md:flex flex-wrap justify-end">
           <div className="flex items-center">
-            <Searchbox
-              placeholder="Filter software"
-              onSearch={handleSearch}
-              defaultValue={search}
-            />
             <SoftwareKeywordFilter
               items={keywords ?? []}
               onApply={handleFilters}
             />
+            <Searchbox
+              placeholder={keywords?.length ? 'Find within selection' : 'Find software'}
+              onSearch={handleSearch}
+              defaultValue={search}
+            />
           </div>
           <TablePagination
             component="nav"
@@ -176,6 +176,8 @@ export async function getServerSideProps(context:GetServerSidePropsContext) {
     offset: rows * page,
   })
 
+  // console.log('software...url...', url)
+
   // get software list, we do not pass the token
   // when token is passed it will return not published items too
   const software = await getSoftwareList({url})
diff --git a/frontend/public/data/settings.json b/frontend/public/data/settings.json
index 3eb169f9b..8ef251b04 100644
--- a/frontend/public/data/settings.json
+++ b/frontend/public/data/settings.json
@@ -8,7 +8,8 @@
       "enabled": true,
       "url": "rsd@esciencecenter.nl",
       "issues_page_url": "https://github.com/research-software-directory/RSD-as-a-service/issues"
-    }
+    },
+    "login_info_url":"https://research-software-directory.github.io/documentation/getting-started.html#signing-in"
   },
   "links": [
     {
diff --git a/frontend/styles/global.css b/frontend/styles/global.css
index 4d6144a62..685605125 100644
--- a/frontend/styles/global.css
+++ b/frontend/styles/global.css
@@ -23,8 +23,6 @@
 
 body{
   font-size: 1rem;
-  /* minimal with to have logo, menu and profile */
-  min-width: 29rem;
 }
 
 #__next {
diff --git a/frontend/utils/getOrganisations.ts b/frontend/utils/getOrganisations.ts
index 14ae41521..ddc80b609 100644
--- a/frontend/utils/getOrganisations.ts
+++ b/frontend/utils/getOrganisations.ts
@@ -13,7 +13,7 @@ import logger from './logger'
 import {paginationUrlParams} from './postgrestUrl'
 
 
-export function organisationUrl({search, rows = 12, page = 0}:
+export function organisationListUrl({search, rows = 12, page = 0}:
   { search: string | undefined, rows: number, page: number }) {
   // by default order is on software count and name
   let url = `${process.env.POSTGREST_URL}/rpc/organisations_overview?parent=is.null&order=score.desc.nullslast,name.asc`
@@ -32,7 +32,7 @@ export function organisationUrl({search, rows = 12, page = 0}:
 export async function getOrganisationsList({search, rows, page, token}:
   { search: string | undefined, rows: number, page: number, token: string | undefined }) {
   try {
-    const url = organisationUrl({search, rows, page})
+    const url = organisationListUrl({search, rows, page})
 
     const resp = await fetch(url, {
       method: 'GET',
diff --git a/frontend/utils/postgrestUrl.ts b/frontend/utils/postgrestUrl.ts
index 6d60d0025..c8e7bd34c 100644
--- a/frontend/utils/postgrestUrl.ts
+++ b/frontend/utils/postgrestUrl.ts
@@ -25,7 +25,7 @@ type QueryParams={
   rows?:number
 }
 
-export function softwareUrl(params:QueryParams){
+export function ssrSoftwareUrl(params:QueryParams){
   const view = 'software'
   const url = ssrUrl(params, view)
   return url
@@ -139,9 +139,16 @@ export function softwareListUrl(props: PostgrestParams) {
   let query = baseQueryString(props)
 
   if (search) {
-    // search for term in brand_name and short_statement
-    // we use ilike (case INsensitive) and * to indicate partial string match
-    query += `&or=(brand_name.ilike.*${search}*, short_statement.ilike.*${search}*)`
+    // console.log('softwareListUrl...keywords...', props.keywords)
+    const encodedSearch = encodeURIComponent(search)
+    // if keyword filter is not used we search in keywords too!
+    if (typeof props.keywords === 'undefined' || props.keywords===null) {
+      query += `&or=(brand_name.ilike.*${encodedSearch}*,short_statement.ilike.*${encodedSearch}*,keywords.cs.%7B${encodedSearch}%7D)`
+    } else {
+      // search for term in brand_name and short_statement
+      // we use ilike (case INsensitive) and * to indicate partial string match
+      query += `&or=(brand_name.ilike.*${encodedSearch}*,short_statement.ilike.*${encodedSearch}*)`
+    }
   }
 
   const url = `${baseUrl}/rpc/software_search?${query}`
@@ -155,9 +162,15 @@ export function projectListUrl(props: PostgrestParams) {
   let query = baseQueryString(props)
 
   if (search) {
-    // search for term in brand_name and short_statement
-    // we use ilike (case INsensitive) and * to indicate partial string match
-    query += `&or=(title.ilike.*${search}*,subtitle.ilike.*${search}*)`
+    const encodedSearch = encodeURIComponent(search)
+    // if keyword filter is not used we search in keywords too!
+    if (typeof props.keywords === 'undefined' || props.keywords === null) {
+      query += `&or=(title.ilike.*${search}*,subtitle.ilike.*${search}*,keywords.cs.%7B${encodedSearch}%7D)`
+    } else {
+      // search for term in brand_name and short_statement
+      // we use ilike (case INsensitive) and * to indicate partial string match
+      query += `&or=(title.ilike.*${search}*,subtitle.ilike.*${search}*)`
+    }
   }
 
   const url = `${baseUrl}/rpc/project_search?${query}`