diff --git a/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql b/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql
index 92cf3273944c91677dee3f32c628faa343e3c83b..8d13fb781077c8ba64bb858c7b00f2b5d779d0de 100644
--- a/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql
+++ b/module/VuFind/sql/migrations/pgsql/3.0/003-add-record-table.sql
@@ -1,8 +1,8 @@
 --
--- Table structure for table `record`
+-- Table structure for table record
 --
 
-CREATE TABLE `record` (
+CREATE TABLE record (
   id serial NOT NULL,
   record_id varchar(255),
   source varchar(50),
diff --git a/module/VuFind/sql/pgsql.sql b/module/VuFind/sql/pgsql.sql
index 1b54218b220b2aa466b453e1c03f3b2d5cb92364..94b949066dd4225a0cd9d6419776ec9f0da65e4b 100644
--- a/module/VuFind/sql/pgsql.sql
+++ b/module/VuFind/sql/pgsql.sql
@@ -22,6 +22,8 @@ CREATE INDEX comments_resource_id_idx ON comments (resource_id);
 -- Table structure for table resource
 --
 
+DROP TABLE IF EXISTS "resource";
+
 CREATE TABLE resource (
 id SERIAL,
 record_id varchar(255) NOT NULL DEFAULT '',
@@ -40,6 +42,8 @@ CREATE INDEX resource_record_id_idx ON resource (record_id);
 -- Table structure for table resource_tags
 --
 
+DROP TABLE IF EXISTS "resource_tags";
+
 CREATE TABLE resource_tags (
 id SERIAL,
 resource_id int NOT NULL DEFAULT '0',
@@ -61,6 +65,8 @@ CREATE INDEX resource_tags_list_id_idx ON resource_tags (list_id);
 -- Table structure for table search. Than fixed created column default value. Old value is 0000-00-00.
 --
 
+DROP TABLE IF EXISTS "search";
+
 CREATE TABLE search (
 id SERIAL,
 user_id int NOT NULL DEFAULT '0',
@@ -84,6 +90,8 @@ CREATE INDEX session_id_idx ON search (session_id);
 -- Table structure for table tags
 --
 
+DROP TABLE IF EXISTS "tags";
+
 CREATE TABLE tags (
 id SERIAL,
 tag varchar(64) NOT NULL DEFAULT '',
@@ -96,6 +104,8 @@ PRIMARY KEY (id)
 -- Table structure for table user
 --
 
+DROP TABLE IF EXISTS "user";
+
 CREATE TABLE "user"(
 id SERIAL,
 username varchar(255) NOT NULL DEFAULT '',
@@ -123,6 +133,8 @@ UNIQUE (username)
 -- Table structure for table user_list
 --
 
+DROP TABLE IF EXISTS "user_list";
+
 CREATE TABLE user_list (
 id SERIAL,
 user_id int NOT NULL,
@@ -141,6 +153,8 @@ CREATE INDEX user_list_user_id_idx ON user_list (user_id);
 -- Table structure for table user_resource
 --
 
+DROP TABLE IF EXISTS "user_resource";
+
 CREATE TABLE user_resource (
 id SERIAL,
 user_id int NOT NULL,
@@ -175,7 +189,7 @@ UNIQUE (session_id)
 CREATE INDEX last_used_idx on session(last_used);
 
 --
--- Table structure for table `change_tracker`
+-- Table structure for table change_tracker
 --
 
 DROP TABLE IF EXISTS "change_tracker";
@@ -192,7 +206,7 @@ PRIMARY KEY (core, id)
 CREATE INDEX change_tracker_deleted_idx on change_tracker(deleted);
 
 --
--- Table structure for table `oai_resumption`
+-- Table structure for table oai_resumption
 --
 
 DROP TABLE IF EXISTS "oai_resumption";
@@ -211,7 +225,7 @@ PRIMARY KEY (id)
 --
 
 --
--- Table structure for table `statistics`
+-- Table structure for table statistics
 --
 
 DROP TABLE IF EXISTS "user_stats_fields";
@@ -226,7 +240,7 @@ PRIMARY KEY (id, field)
 -- --------------------------------------------------------
 
 --
--- Table structure for table `user_stats`
+-- Table structure for table user_stats
 --
 
 DROP TABLE IF EXISTS "user_stats";
@@ -246,12 +260,12 @@ PRIMARY KEY (id)
 -- --------------------------------------------------------
 
 --
--- Table structure for table `record`
+-- Table structure for table record
 --
 
 DROP TABLE IF EXISTS "record";
 
-CREATE TABLE `record` (
+CREATE TABLE record (
   id serial NOT NULL,
   record_id varchar(255),
   source varchar(50),
@@ -265,12 +279,12 @@ CREATE TABLE `record` (
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table `user_card`
+-- Table structure for table user_card
 --
 
 DROP TABLE IF EXISTS "user_card";
 
-CREATE TABLE `user_card` (
+CREATE TABLE user_card (
 id SERIAL,
 user_id int NOT NULL,
 card_name varchar(255) NOT NULL DEFAULT '',