diff --git a/src/component/fileListItem/view.js b/src/component/fileListItem/view.js
index 849feeb..96b5119 100644
--- a/src/component/fileListItem/view.js
+++ b/src/component/fileListItem/view.js
@@ -46,7 +46,7 @@ class FileListItem extends React.PureComponent {
     const { autoplay, claim, featuredResult, navigation, uri, shortUrl } = this.props;
 
     if (featuredResult && !claim) {
-      navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISH, params: { vanityUrl: uri } });
+      navigation.navigate({ routeName: Constants.DRAWER_ROUTE_PUBLISH, params: { vanityUrl: uri.trim() } });
     } else {
       navigateToUri(navigation, shortUrl || uri, { autoplay });
     }
@@ -176,7 +176,7 @@ class FileListItem extends React.PureComponent {
 
             {featuredResult && !isResolving && !claim && (
               <View style={fileListStyle.titleContainer}>
-                <Text style={fileListStyle.featuredTitle}>Nothing here. Claim this address!</Text>
+                <Text style={fileListStyle.featuredTitle}>Nothing here. Publish something!</Text>
               </View>
             )}
 
diff --git a/src/page/publish/view.js b/src/page/publish/view.js
index fe3b2d7..2f74a3c 100644
--- a/src/page/publish/view.js
+++ b/src/page/publish/view.js
@@ -184,7 +184,7 @@ class PublishPage extends React.PureComponent {
         const { editMode, claimToEdit, vanityUrl } = navigation.state.params;
         if (editMode) {
           this.prepareEdit(claimToEdit);
-        } else if (vanityUrl && vanityUrl.trim().length > 0) {
+        } else if (vanityUrl) {
           const { claimName } = parseURI(vanityUrl);
           this.setState({
             name: claimName,