diff --git a/www/libs/Class.Basic.inc b/www/libs/Class.Basic.inc
index 81f5d7ff..99284e60 100644
--- a/www/libs/Class.Basic.inc
+++ b/www/libs/Class.Basic.inc
@@ -1239,8 +1239,8 @@
 				return FALSE;
 
 			// splits the data up with / or -
-			list ($start_year, $start_month, $start_day) = split('[/-]', $start_date);
-			list ($end_year, $end_month, $end_day) = split('[/-]', $end_date);
+			list ($start_year, $start_month, $start_day) = explode('[/-]', $start_date);
+			list ($end_year, $end_month, $end_day) = explode('[/-]', $end_date);
 			// check that month & day are two digits and then combine
 			foreach (array('start', 'end') as $prefix)
 			{
diff --git a/www/libs/Class.DB.IO.inc b/www/libs/Class.DB.IO.inc
index b7592cb1..e622f191 100644
--- a/www/libs/Class.DB.IO.inc
+++ b/www/libs/Class.DB.IO.inc
@@ -1423,6 +1423,10 @@
 							$this->prepare_cursor[$stm_name]['returning_id'] = true;
 						}
 					}
+					else
+					{
+						$this->prepare_cursor[$stm_name]['pk_name'] = $pk_name;
+					}
 				}
 				// search for $1, $2, in the query and push it into the control array
 				preg_match_all('/(\$[0-9]{1,})/', $query, $match);