diff --git a/src/calc2/main.tsx b/src/calc2/main.tsx
index c047802b..5e2210a0 100644
--- a/src/calc2/main.tsx
+++ b/src/calc2/main.tsx
@@ -67,7 +67,7 @@ export class Main extends React.Component<Props, State> {
 								<Redirect from="/relax/calc" to="/relax/calc/local/uibk/local/0" exact strict />
 								<Route path="/relax/calc/:source/:id/:filename/:index" component={ConnectedCalc} />
 								<Route path="/relax/calc/:source/:id" component={ConnectedCalc} />
-								<Route path="/relax/calc/:source/:id/:filename/:index" component={ConnectedCalc} />
+								<Route path="/relax/api/:source/:id/:filename/:index" component={ConnectedCalc} />
 								<Route path="/relax/api/:source/:id" component={ConnectedCalc} />
 								<Route render={match => (
 									<div className="view-min"><h1>404</h1>
diff --git a/src/calc2/store/groups.ts b/src/calc2/store/groups.ts
index 69227de4..cee4ab00 100644
--- a/src/calc2/store/groups.ts
+++ b/src/calc2/store/groups.ts
@@ -68,16 +68,39 @@ export function* rootSaga() {
 				};
 				yield saga.put(success);
 				if (setCurrent !== undefined && loadedGroups.length > 0) {
-					const { source, id, filename } = loadedGroups[0].groupInfo;
-
-					const setCurrent: GROUP_SET_CURRENT = {
-						type: 'GROUP_SET_CURRENT',
-						source,
-						id,
-						filename,
-						index: 0,
-					};
-					yield saga.put(setCurrent);
+					// In case the :filename and :index are set in the URL,
+					// it's necessary to set the correct group accordingly
+					if (setCurrent && setCurrent != 'first' && 
+						setCurrent.filename && setCurrent.index) {
+						for(var i=0;i<loadedGroups.length;i++) {
+							const g = loadedGroups[i];
+							const { source, id, filename, index } = g.groupInfo;
+							if (filename == setCurrent.filename && index == setCurrent.index) {
+								const setCurrent: GROUP_SET_CURRENT = {
+									type: 'GROUP_SET_CURRENT',
+									source,
+									id,
+									filename,
+									index,
+								};
+								yield saga.put(setCurrent);
+								break;
+							}
+						}
+					}
+					// Otherwise, just try using the first group
+					else {
+						const { source, id, filename } = loadedGroups[0].groupInfo;
+
+						const setCurrent: GROUP_SET_CURRENT = {
+							type: 'GROUP_SET_CURRENT',
+							source,
+							id,
+							filename,
+							index: 0,
+						};
+						yield saga.put(setCurrent);
+					}
 				}
 			}
 			catch (e) {
diff --git a/src/calc2/utils/groupUtils.ts b/src/calc2/utils/groupUtils.ts
index 87e49358..d808bb05 100644
--- a/src/calc2/utils/groupUtils.ts
+++ b/src/calc2/utils/groupUtils.ts
@@ -179,7 +179,8 @@ export function loadGroupsFromSource(source: GroupSourceType, id: string, mainta
               reject(new Error('gist ' + id + ' not found'));
             },
           },
-          async: true,
+          timeout: 10000,
+          async: false,
         });
         break;
       }
diff --git a/src/calc2/views/api.tsx b/src/calc2/views/api.tsx
index 9d0e9ed2..e34369c3 100644
--- a/src/calc2/views/api.tsx
+++ b/src/calc2/views/api.tsx
@@ -28,8 +28,13 @@ export class Api extends React.Component<Props, State> {
 	constructor(props: Props) {
 		super(props);
 		this.state = {};
-		this.mode = props.params.mode;
-		this.query = atob(props.params.query)
+    this.mode = props.params.mode;
+		// Fix issue of parsing + as a space
+		// https://www.npmjs.com/package/query-string
+		// https://github.com/sindresorhus/query-string/issues/305
+		// https://stackoverflow.com/questions/2678551/when-to-encode-space-to-plus-or-20
+		// https://stackoverflow.com/questions/3794919/replace-all-spaces-in-a-string-with
+		this.query = atob(props.params.query.split(' ').join('+'))
 	}
 
 	componentDidMount() {
diff --git a/src/calc2/views/calc.tsx b/src/calc2/views/calc.tsx
index c70b5b99..525ceeae 100644
--- a/src/calc2/views/calc.tsx
+++ b/src/calc2/views/calc.tsx
@@ -50,6 +50,11 @@ export class Calc extends React.Component<Props> {
 		})*/
 		this.apiView = this.props.location.pathname.split("/")[2] == "api"
 		this.params = queryString.parse(this.props.location.search)
+
+		// It's necessary to load remote group synchronouly
+		if (this.apiView) {
+			this.loadGroup(this.props);
+		}
 	}
 
 	componentDidUpdate(prevProps: Props): void {