diff --git a/core/model/db/db.go b/core/model/db/db.go
index 242cf0e..73e8b77 100644
--- a/core/model/db/db.go
+++ b/core/model/db/db.go
@@ -63,6 +63,9 @@ func (db *DB) Escape(sql string) string {
 			break
 		case '\032': /* This gives problems on Win32 */
 			escape = 'Z'
+			break
+		case '%':
+			escape = '%'
 		}
 
 		if escape != 0 {
diff --git a/core/ws/ws.go b/core/ws/ws.go
index 43cca16..7e7201d 100644
--- a/core/ws/ws.go
+++ b/core/ws/ws.go
@@ -183,6 +183,7 @@ func unsubscribe(conn *websocket.Conn, key string, clientMap map[string][]*webso
 }
 
 func unsubscribeAll(conn *websocket.Conn) {
+	// TODO fix "concurrent map iteration and map write" error
 	for key, conns := range txSubscriptions {
 		newConns := conns[:0]
 		for _, c := range conns {