diff --git a/lib/csql.rb b/lib/csql.rb
index d629ae8..4d7bb5f 100644
--- a/lib/csql.rb
+++ b/lib/csql.rb
@@ -12,7 +12,7 @@ def initialize(filepath)
 
     def execute query
       begin
-        modified_query = query.gsub(/csv/, @filepath)
+        modified_query = query.gsub(/ from csv /, " from #{@filepath} ")
         result,err,process = Open3.capture3("q -H -d \',\' \'#{modified_query}\'")
         if err != ""
           raise CSQLException.new(err)
@@ -24,7 +24,7 @@ def execute query
       if column == "*"
         columns = File.open(@filepath,'r').gets.chomp.split(',').map{|c|c.strip}
       else
-        columns = column.chomp.split(',').map{|c|c.gsub('`','').split(/as|AS/).last.strip}
+        columns = column.chomp.split(',').map{|c|c.gsub('`','').split(/ (as|AS) /).last.strip}
       end
       return result.chomp.split("\n").map{|r|
         data = r.split(",")