diff --git a/nbproject/project.xml b/nbproject/project.xml
index d7ed868..5c0512a 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.cnd.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>vtcli</name>
+            <name>vtcli.v1</name>
             <make-project-type>0</make-project-type>
             <c-extensions/>
             <cpp-extensions>cpp</cpp-extensions>
diff --git a/src/nbproject/project.xml b/src/nbproject/project.xml
index 69d31bf..d57279a 100644
--- a/src/nbproject/project.xml
+++ b/src/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.cnd.makeproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>vtapi</name>
+            <name>vtapi.v1</name>
             <make-project-type>0</make-project-type>
             <c-extensions/>
             <cpp-extensions>cpp</cpp-extensions>
diff --git a/src/query.cpp b/src/query.cpp
index 7ea1ab8..929b28b 100644
--- a/src/query.cpp
+++ b/src/query.cpp
@@ -53,7 +53,7 @@ bool Query::execute() {
                 logger->debug(toString(PQcmdTuples(res)) + " row(s) (not)affected");
             }
             else {
-                warning(2011, "You should never see this warning since 2011 :(");
+                warning(2011, "This is a very strange warning you should never see :(");
             }
         }
     }
@@ -185,7 +185,11 @@ bool Query::whereString(const String& key, const String& value, const String& op
     // FIXME: buffer overflow!! use params!
     if (value.compare("NULL") == 0) {
         where += "IS NULL";
-    } else {
+    }
+    else if (value.compare("NOT NULL") == 0) {
+        where += "IS NOT NULL";
+    }
+    else {
         where += oper + " " + String(PQescapeLiteral(connector->conn, value.c_str(), value.length()));
     }
 
@@ -238,7 +242,14 @@ bool Select::from(const String& table, const String& column) {
 
 // FIXME: vyuzit params (zauvozovkovat nazvy tabulek a datasetu???)
 String Select::getQuery() {
-    if (fromList.empty()) return queryString; // in case of a direct query
+    if (fromList.empty()) {
+        if (!queryString.empty()) return queryString; // in case of a direct query
+        // else add * from this->table
+        else if (!table.empty()) {
+            this->from(table, "*");
+        }
+        else warning(2012, "No table specified - don't know how to make a query.");
+    }
 
     queryString = "SELECT ";
     String tmpStr = "";