diff --git a/pihole b/pihole
index 45f7ea92..839ea8cd 100755
--- a/pihole
+++ b/pihole
@@ -85,7 +85,8 @@ updateGravityFunc() {
 
 # Scan an array of files for matching strings
 scanList(){
-  local domain="${1}" lists="${2}" type="${3:-}"
+  # Escape full stops
+  local domain="${1//./\\.}" lists="${2}" type="${3:-}"
 
   # Prevent grep from printing file path
   cd "/etc/pihole" || exit 1
@@ -154,7 +155,7 @@ Options:
 
   # Strip valid options, leaving only the domain and invalid options
   # This allows users to place the options before or after the domain
-  options=$(sed -E 's/ ?-(bp|adlists?|all|exact)//g' <<< "${options}")
+  options=$(sed -E 's/ ?-(bp|adlists?|all|exact) ?//g' <<< "${options}")
 
   # Handle remaining options
   # If $options contain non ASCII characters, convert to punycode