diff --git a/include/profile_selectors.php b/include/profile_selectors.php
index f4b30f2118..92579f64aa 100644
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
@@ -16,7 +16,7 @@ function gender_selector($current="",$suffix="") {
 
 function sexpref_selector($current="",$suffix="") {
 	$o = '';
-	$select = array('', t('Males'), t('Females'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
+	$select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
 
 	$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
 	foreach($select as $selection) {
diff --git a/mod/directory.php b/mod/directory.php
index 449c89174d..49aac657ce 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -18,7 +18,7 @@ function directory_content(&$a) {
 	if(x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
 	else
-		$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
 	$tpl = load_view_file('view/directory_header.tpl');