[BUGFIX] Prevent redirection loop for shortcuts