diff --git a/JavaSource/ChangeLog.hbm.xml b/JavaSource/ChangeLog.hbm.xml
index d4f45ea59f..c49eb56ecb 100644
--- a/JavaSource/ChangeLog.hbm.xml
+++ b/JavaSource/ChangeLog.hbm.xml
@@ -101,8 +101,7 @@
         <property
             name="detail"
             column="detail"
-            type="org.unitime.commons.hibernate.blob.XmlBlobType"
-            length="65535"/>
+            type="byte[]"/>
 
     </class>
 </hibernate-mapping>
diff --git a/JavaSource/Event.hbm.xml b/JavaSource/Event.hbm.xml
index 87e45e7df9..b8b5c53225 100644
--- a/JavaSource/Event.hbm.xml
+++ b/JavaSource/Event.hbm.xml
@@ -130,7 +130,7 @@
 			type="java.lang.Long"
 			not-null="false"
 			lazy="true"
-			formula=" ( select sa.department_uniqueid from %SCHEMA%.class_ c, %SCHEMA%.scheduling_subpart ss, %SCHEMA%.instr_offering_config ioc, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co, %SCHEMA%.subject_area sa where c.uniqueid = class_id and ss.uniqueid = c.subpart_id and ioc.uniqueid = ss.config_id and io.uniqueid = ioc.instr_offr_id and co.instr_offr_id = io.uniqueid and co.is_control = 1 and sa.uniqueid = co.subject_area_id ) "
+			formula=" ( select sa.department_uniqueid from %SCHEMA%.class_ c, %SCHEMA%.scheduling_subpart ss, %SCHEMA%.instr_offering_config ioc, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co, %SCHEMA%.subject_area sa where c.uniqueid = class_id and ss.uniqueid = c.subpart_id and ioc.uniqueid = ss.config_id and io.uniqueid = ioc.instr_offr_id and co.instr_offr_id = io.uniqueid and co.is_control = %TRUE% and sa.uniqueid = co.subject_area_id ) "
 		/>
 		
 		<set
diff --git a/JavaSource/ItypeDesc.hbm.xml b/JavaSource/ItypeDesc.hbm.xml
index 344987b847..ff5055c7ff 100644
--- a/JavaSource/ItypeDesc.hbm.xml
+++ b/JavaSource/ItypeDesc.hbm.xml
@@ -53,9 +53,8 @@
         <property
             name="basic"
             column="basic"
-            type="java.lang.Integer"
-            not-null="false"
-            length="1"/>
+            type="java.lang.Boolean"
+            not-null="false"/>
 
         <property
             name="organized"
diff --git a/JavaSource/PitClass.hbm.xml b/JavaSource/PitClass.hbm.xml
index fb4911c0f0..e8bb73b3b5 100644
--- a/JavaSource/PitClass.hbm.xml
+++ b/JavaSource/PitClass.hbm.xml
@@ -63,7 +63,7 @@
 		    name="controllingDept"
 		    class="Department"
 		    lazy="false"
-		    formula=" ( select sa.department_uniqueid from %SCHEMA%.pit_sched_subpart ss, %SCHEMA%.pit_instr_offer_config ioc, %SCHEMA%.pit_instr_offering io, %SCHEMA%.pit_course_offering co, %SCHEMA%.subject_area sa where ss.uniqueid = pit_subpart_id and ioc.uniqueid = ss.pit_config_id and io.uniqueid = ioc.pit_instr_offr_id and co.pit_instr_offr_id = io.uniqueid and co.is_control = 1 and sa.uniqueid = co.subject_area_id ) "/>
+		    formula=" ( select sa.department_uniqueid from %SCHEMA%.pit_sched_subpart ss, %SCHEMA%.pit_instr_offer_config ioc, %SCHEMA%.pit_instr_offering io, %SCHEMA%.pit_course_offering co, %SCHEMA%.subject_area sa where ss.uniqueid = pit_subpart_id and ioc.uniqueid = ss.pit_config_id and io.uniqueid = ioc.pit_instr_offr_id and co.pit_instr_offr_id = io.uniqueid and co.is_control = %TRUE% and sa.uniqueid = co.subject_area_id ) "/>
 		
 		<many-to-one
 		    name="clazz"
diff --git a/JavaSource/PitSchedulingSubpart.hbm.xml b/JavaSource/PitSchedulingSubpart.hbm.xml
index ef3a44fab2..ede76e41c3 100644
--- a/JavaSource/PitSchedulingSubpart.hbm.xml
+++ b/JavaSource/PitSchedulingSubpart.hbm.xml
@@ -73,7 +73,7 @@
     <property
         name="courseName"
         type="java.lang.String"
-        formula="(select concat( concat( sa.subject_area_abbreviation , ' ') , co.course_nbr) from %SCHEMA%.pit_sched_subpart s, %SCHEMA%.pit_instr_offer_config c, %SCHEMA%.pit_instr_offering io, %SCHEMA%.pit_course_offering co, %SCHEMA%.subject_area sa where s.uniqueid=uniqueid and s.pit_config_id=c.uniqueid and c.pit_instr_offr_id=io.uniqueid and co.is_control=1 and co.pit_instr_offr_id=io.uniqueid and co.subject_area_id=sa.uniqueid)"
+        formula="(select concat( concat( sa.subject_area_abbreviation , ' ') , co.course_nbr) from %SCHEMA%.pit_sched_subpart s, %SCHEMA%.pit_instr_offer_config c, %SCHEMA%.pit_instr_offering io, %SCHEMA%.pit_course_offering co, %SCHEMA%.subject_area sa where s.uniqueid=uniqueid and s.pit_config_id=c.uniqueid and c.pit_instr_offr_id=io.uniqueid and co.is_control = %TRUE% and co.pit_instr_offr_id=io.uniqueid and co.subject_area_id=sa.uniqueid)"
         update="false"
         insert="false"/>
 
diff --git a/JavaSource/PreferenceGroup.hbm.xml b/JavaSource/PreferenceGroup.hbm.xml
index e4ca5a6b8a..92acfbdd85 100644
--- a/JavaSource/PreferenceGroup.hbm.xml
+++ b/JavaSource/PreferenceGroup.hbm.xml
@@ -87,7 +87,7 @@
             <property
                 name="courseName"
                 type="java.lang.String"
-                formula="(select concat( concat( sa.subject_area_abbreviation , ' ') , co.course_nbr) from %SCHEMA%.scheduling_subpart s, %SCHEMA%.instr_offering_config c, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co, %SCHEMA%.subject_area sa where s.uniqueid=uniqueid and s.config_id=c.uniqueid and c.instr_offr_id=io.uniqueid and co.is_control=1 and co.instr_offr_id=io.uniqueid and co.subject_area_id=sa.uniqueid)"
+                formula="(select concat( concat( sa.subject_area_abbreviation , ' ') , co.course_nbr) from %SCHEMA%.scheduling_subpart s, %SCHEMA%.instr_offering_config c, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co, %SCHEMA%.subject_area sa where s.uniqueid=uniqueid and s.config_id=c.uniqueid and c.instr_offr_id=io.uniqueid and co.is_control = %TRUE% and co.instr_offr_id=io.uniqueid and co.subject_area_id=sa.uniqueid)"
                 update="false"
                 insert="false"/>
 
@@ -102,7 +102,7 @@
 				name="controllingCourseOffering" 
 				class="CourseOffering"
 				lazy="proxy" 
-				formula="(select co.uniqueid from %SCHEMA%.scheduling_subpart s, %SCHEMA%.instr_offering_config c, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co where s.uniqueid=UNIQUEID and s.config_id=c.uniqueid and c.instr_offr_id=io.uniqueid and co.is_control=1 and co.instr_offr_id=io.uniqueid)"
+				formula="(select co.uniqueid from %SCHEMA%.scheduling_subpart s, %SCHEMA%.instr_offering_config c, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co where s.uniqueid=UNIQUEID and s.config_id=c.uniqueid and c.instr_offr_id=io.uniqueid and co.is_control = %TRUE% and co.instr_offr_id=io.uniqueid)"
 			/>	
       		-->
             <many-to-one
@@ -227,7 +227,7 @@
                 name="controllingDept"
                 class="Department"
                 lazy="false"
-                formula=" ( select sa.department_uniqueid from %SCHEMA%.scheduling_subpart ss, %SCHEMA%.instr_offering_config ioc, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co, %SCHEMA%.subject_area sa where ss.uniqueid = subpart_id and ioc.uniqueid = ss.config_id and io.uniqueid = ioc.instr_offr_id and co.instr_offr_id = io.uniqueid and co.is_control = 1 and sa.uniqueid = co.subject_area_id ) "/>
+                formula=" ( select sa.department_uniqueid from %SCHEMA%.scheduling_subpart ss, %SCHEMA%.instr_offering_config ioc, %SCHEMA%.instructional_offering io, %SCHEMA%.course_offering co, %SCHEMA%.subject_area sa where ss.uniqueid = subpart_id and ioc.uniqueid = ss.config_id and io.uniqueid = ioc.instr_offr_id and co.instr_offr_id = io.uniqueid and co.is_control = %TRUE% and sa.uniqueid = co.subject_area_id ) "/>
 
             <many-to-one
                 name="managingDept"
@@ -356,7 +356,7 @@
                 class="org.unitime.timetable.model.Assignment"
                 not-null="false"
                 lazy="proxy"
-                formula=" (       select a.uniqueid from        %SCHEMA%.assignment a,        %SCHEMA%.solution s,        %SCHEMA%.department d,       %SCHEMA%.solver_group g      where a.class_id=uniqueid and        a.solution_id=s.uniqueid and        s.commited=1 and        d.uniqueid=managing_dept and        s.owner_id=g.uniqueid and       d.solver_group_id=g.uniqueid ) "/>
+                formula=" (       select a.uniqueid from        %SCHEMA%.assignment a,        %SCHEMA%.solution s,        %SCHEMA%.department d,       %SCHEMA%.solver_group g      where a.class_id=uniqueid and        a.solution_id=s.uniqueid and        s.commited = %TRUE% and        d.uniqueid=managing_dept and        s.owner_id=g.uniqueid and       d.solver_group_id=g.uniqueid ) "/>
 
             <!--
 			<one-to-one name="sectioningInfo" class="SectioningInfo" property-ref="clazz" cascade="all"/>
diff --git a/JavaSource/StudentSectHistory.hbm.xml b/JavaSource/StudentSectHistory.hbm.xml
index 5b2e5afaca..bb6dee3968 100644
--- a/JavaSource/StudentSectHistory.hbm.xml
+++ b/JavaSource/StudentSectHistory.hbm.xml
@@ -42,9 +42,8 @@
         <property
             name="data"
             column="data"
-            type="org.unitime.commons.hibernate.blob.XmlBlobType"
-            not-null="true"
-            length="65535"/>
+            type="byte[]"
+            not-null="true"/>
 
         <property
             name="type"
diff --git a/JavaSource/StudentSectQueue.hbm.xml b/JavaSource/StudentSectQueue.hbm.xml
index 8149df4e87..9807d0a8a0 100644
--- a/JavaSource/StudentSectQueue.hbm.xml
+++ b/JavaSource/StudentSectQueue.hbm.xml
@@ -52,9 +52,9 @@
             length="10"/>
 
         <property
-            name="message"
+            name="data"
             column="message"
-            type="org.unitime.commons.hibernate.blob.XmlClobType"
+            type="java.lang.String"
             not-null="false"/>
 
     </class>
diff --git a/JavaSource/org/unitime/commons/hibernate/util/HibernateUtil.java b/JavaSource/org/unitime/commons/hibernate/util/HibernateUtil.java
index fedc9bee10..77b6b27fe0 100644
--- a/JavaSource/org/unitime/commons/hibernate/util/HibernateUtil.java
+++ b/JavaSource/org/unitime/commons/hibernate/util/HibernateUtil.java
@@ -39,6 +39,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.Oracle8iDialect;
+import org.hibernate.dialect.PostgreSQL9Dialect;
 import org.hibernate.dialect.function.SQLFunctionTemplate;
 import org.hibernate.dialect.function.StandardSQLFunction;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
@@ -129,23 +130,32 @@ public static String getProperty(Properties properties, String name) {
         return value;
     }
     
-    public static void fixSchemaInFormulas(Configuration cfg) {
+    public static void fixSchemaInFormulas(Configuration cfg) throws ClassNotFoundException {
     	cfg.buildMappings();
-        String schema = cfg.getProperty("default_schema"); 
-        if (schema!=null) {
-            for (Iterator i=cfg.getClassMappings();i.hasNext();) {
-                PersistentClass pc = (PersistentClass)i.next();
-                for (Iterator j=pc.getPropertyIterator();j.hasNext();) {
-                    Property p = (Property)j.next();
-                    for (Iterator k=p.getColumnIterator();k.hasNext();) {
-                        Selectable c = (Selectable)k.next();
-                        if (c instanceof Formula) {
-                            Formula f = (Formula)c;
-                            if (f.getFormula()!=null && f.getFormula().indexOf("%SCHEMA%")>=0) {
-                                f.setFormula(f.getFormula().replaceAll("%SCHEMA%", schema));
-                                sLog.debug("Schema updated in "+pc.getClassName()+"."+p.getName()+" to "+f.getFormula());
-                            }
+    	Class dialect = Class.forName(cfg.getProperty("dialect"));
+    	String schema = cfg.getProperty("default_schema");
+    	for (Iterator i=cfg.getClassMappings();i.hasNext();) {
+            PersistentClass pc = (PersistentClass)i.next();
+            for (Iterator j=pc.getPropertyIterator();j.hasNext();) {
+                Property p = (Property)j.next();
+                for (Iterator k=p.getColumnIterator();k.hasNext();) {
+                    Selectable c = (Selectable)k.next();
+                    if (c instanceof Formula) {
+                        Formula f = (Formula)c;
+                        boolean updated = false;
+                        if (schema != null && f.getFormula() != null && f.getFormula().indexOf("%SCHEMA%")>=0) {
+                            f.setFormula(f.getFormula().replaceAll("%SCHEMA%", schema));
+                            sLog.debug("Schema updated in "+pc.getClassName()+"."+p.getName()+" to "+f.getFormula());
                         }
+                        if (f.getFormula()!=null && (f.getFormula().indexOf("%TRUE%")>=0 || f.getFormula().indexOf("%FALSE%")>=0)) {
+                        	if (isPostgress(dialect)) {
+                        		f.setFormula(f.getFormula().replaceAll("%TRUE%", "'t'").replaceAll("%FALSE%", "'f'"));
+                        	} else {
+                        		f.setFormula(f.getFormula().replaceAll("%TRUE%", "1").replaceAll("%FALSE%", "0"));
+                        	}
+                        }
+                        if (updated)
+                        	sLog.debug("Schema updated in "+pc.getClassName()+"."+p.getName()+" to "+f.getFormula());
                     }
                 }
             }
@@ -271,6 +281,8 @@ void setSF(SessionFactory fact) {
         addBitwiseOperationsToDialect();
         sLog.debug("  -- bitwise operation added to the dialect if needed");
         
+        addAddDateToDialect();
+        
         DatabaseUpdate.update();
     }
     
@@ -449,8 +461,16 @@ public static boolean isOracle() {
     	return Oracle8iDialect.class.isAssignableFrom(getDialect());
     }
     
+    public static boolean isPostgress() {
+    	return PostgreSQL9Dialect.class.isAssignableFrom(getDialect());
+    }
+    
+    public static boolean isPostgress(Class dialect) {
+    	return PostgreSQL9Dialect.class.isAssignableFrom(dialect);
+    }
+    
     public static String addDate(String dateSQL, String incrementSQL) {
-        if (isMySQL())
+        if (isMySQL() || isPostgress())
             return "adddate("+dateSQL+","+incrementSQL+")";
         else
             return dateSQL+(incrementSQL.startsWith("+")||incrementSQL.startsWith("-")?"":"+")+incrementSQL;
@@ -459,12 +479,14 @@ public static String addDate(String dateSQL, String incrementSQL) {
     public static String dayOfWeek(String field) {
     	if (isOracle())
     		return "(trunc(" + field + ") - trunc(" + field + ", 'IW'))";
+    	else if (isPostgress())
+    		return "extract(isodow from " + field + ") - 1";
     	else
     		return "weekday(" + field + ")";
     }
     
     public static String date(Date date) {
-    	if (isOracle())
+    	if (isOracle() || isPostgress())
     		return "to_date('" + new SimpleDateFormat("yyyy-MM-dd").format(date) + "', 'YYYY-MM-DD')";
     	else
     		return "str_to_date('" + new SimpleDateFormat("yyyy-MM-dd").format(date) + "', '%Y-%m-%d')";
@@ -475,9 +497,19 @@ public static void addBitwiseOperationsToDialect() {
     	Dialect dialect = hibSessionFactory.getDialect();
     	if (!dialect.getFunctions().containsKey("bit_and")) {
     		if (isOracle())
-    			dialect.getFunctions().put("bit_and", new StandardSQLFunction("bitand", IntegerType.INSTANCE));  
+    			dialect.getFunctions().put("bit_and", new StandardSQLFunction("bitand", IntegerType.INSTANCE));
+    		else if (isPostgress())
+    			dialect.getFunctions().put("bit_and", new SQLFunctionTemplate(IntegerType.INSTANCE, "cast(?1 as int) & cast(?2 as int)"));
     		else
     			dialect.getFunctions().put("bit_and", new SQLFunctionTemplate(IntegerType.INSTANCE, "?1 & ?2"));
     	}
     }
+    
+    public static void addAddDateToDialect() {
+    	SessionFactoryImplementor hibSessionFactory = (SessionFactoryImplementor)new _RootDAO().getSession().getSessionFactory();
+    	Dialect dialect = hibSessionFactory.getDialect();
+    	if (isPostgress() && !dialect.getFunctions().containsKey("adddate")) {
+    		dialect.getFunctions().put("adddate", new SQLFunctionTemplate(IntegerType.INSTANCE, "?1 + (?2) * interval '1 day'"));
+    	}
+    }
 }
diff --git a/JavaSource/org/unitime/timetable/action/DepartmentEditAction.java b/JavaSource/org/unitime/timetable/action/DepartmentEditAction.java
index 467969cc43..caaa4dc04c 100644
--- a/JavaSource/org/unitime/timetable/action/DepartmentEditAction.java
+++ b/JavaSource/org/unitime/timetable/action/DepartmentEditAction.java
@@ -188,7 +188,7 @@ private void doDelete(DepartmentEditForm frm) throws Exception{
                 hibSession.createQuery(
                         "delete StudentClassEnrollment e where e.clazz.uniqueId in " +
                         "(select c.uniqueId from Class_ c, CourseOffering co where " +
-                        "co.isControl=1 and " +
+                        "co.isControl=true and " +
                         "c.schedulingSubpart.instrOfferingConfig.instructionalOffering=co.instructionalOffering and "+
                         "co.subjectArea.department.uniqueId=:deptId)").
                         setLong("deptId", department.getUniqueId()).
diff --git a/JavaSource/org/unitime/timetable/action/SchedulingSubpartDetailAction.java b/JavaSource/org/unitime/timetable/action/SchedulingSubpartDetailAction.java
index 884909a15a..cd8f4479bd 100644
--- a/JavaSource/org/unitime/timetable/action/SchedulingSubpartDetailAction.java
+++ b/JavaSource/org/unitime/timetable/action/SchedulingSubpartDetailAction.java
@@ -279,7 +279,7 @@ private void doLoad(
 	        	label += " [" + ioc.getName() + "]";
 	        frm.setInstructionalTypeLabel(label);
             frm.setUnlimitedEnroll(ioc.isUnlimitedEnrollment());
-            frm.setItypeBasic(ss.getItype()==null || ss.getItype().getBasic()==1);
+            frm.setItypeBasic(ss.getItype()==null || ss.getItype().getBasic());
             if (!frm.getItypeBasic())
                 LookupTables.setupItypes(request, false);
 	        frm.setSubjectArea(co.getSubjectAreaAbbv());
diff --git a/JavaSource/org/unitime/timetable/action/SchedulingSubpartEditAction.java b/JavaSource/org/unitime/timetable/action/SchedulingSubpartEditAction.java
index 33832cc696..601fc7ed58 100644
--- a/JavaSource/org/unitime/timetable/action/SchedulingSubpartEditAction.java
+++ b/JavaSource/org/unitime/timetable/action/SchedulingSubpartEditAction.java
@@ -356,7 +356,7 @@ private void doLoad(
         	label += " [" + ioc.getName() + "]";
         frm.setInstructionalTypeLabel(label);
         frm.setUnlimitedEnroll(ioc.isUnlimitedEnrollment());
-        frm.setItypeBasic(ss.getItype()==null || ss.getItype().getBasic()==1);
+        frm.setItypeBasic(ss.getItype()==null || ss.getItype().getBasic());
         if (!frm.getItypeBasic())
             LookupTables.setupItypes(request, false);
         frm.setSubjectArea(co.getSubjectAreaAbbv());
diff --git a/JavaSource/org/unitime/timetable/dataexchange/EventImport.java b/JavaSource/org/unitime/timetable/dataexchange/EventImport.java
index 4ad986cd07..451ce86e94 100644
--- a/JavaSource/org/unitime/timetable/dataexchange/EventImport.java
+++ b/JavaSource/org/unitime/timetable/dataexchange/EventImport.java
@@ -597,12 +597,13 @@ private Class_ findClassFromExternalId(String externalId, String year, String te
 		}
 
 		return((Class_) getHibSession().
-		createQuery("select c from Class_ as c inner join c.schedulingSubpart.instrOfferingConfig.instructionalOffering.session as s where s.academicInitiative = :academicInititive and s.academicYear = :aYear and s.academicTerm = :aTerm and c.externalUniqueId = :anExternalId and rownum = 1").
+		createQuery("select c from Class_ as c inner join c.schedulingSubpart.instrOfferingConfig.instructionalOffering.session as s where s.academicInitiative = :academicInititive and s.academicYear = :aYear and s.academicTerm = :aTerm and c.externalUniqueId = :anExternalId").
 		setString("academicInititive", academicInitiative).
 		setString("aYear", year).
 		setString("aTerm", term).
 		setString("anExternalId", externalId).
 		setCacheable(true).
+		setMaxResults(1).
 		uniqueResult());
 
 	}
@@ -613,12 +614,13 @@ private InstructionalOffering findInstructionalOfferingFromExternalId(String ext
 		}
 
 		return((InstructionalOffering) getHibSession().
-		createQuery("select io from InstructionalOffering as io inner join io.session as s where s.academicInitiative = :academicInititive and s.academicYear = :aYear and s.academicTerm = :aTerm and io.externalUniqueId = :anExternalId and rownum = 1").
+		createQuery("select io from InstructionalOffering as io inner join io.session as s where s.academicInitiative = :academicInititive and s.academicYear = :aYear and s.academicTerm = :aTerm and io.externalUniqueId = :anExternalId").
 		setString("academicInititive", academicInitiative).
 		setString("aYear", year).
 		setString("aTerm", term).
 		setString("anExternalId", externalId).
 		setCacheable(true).
+		setMaxResults(1).
 		uniqueResult());
 
 	}
@@ -629,12 +631,13 @@ private CourseOffering findCourseOfferingFromExternalId(String externalId, Strin
 		}
 
 		return((CourseOffering) getHibSession().
-		createQuery("select co from CourseOffering as co inner join co.instructionalOffering.session as s where s.academicInitiative = :academicInititive and s.academicYear = :aYear and s.academicTerm = :aTerm and co.externalUniqueId = :anExternalId and rownum = 1").
+		createQuery("select co from CourseOffering as co inner join co.instructionalOffering.session as s where s.academicInitiative = :academicInititive and s.academicYear = :aYear and s.academicTerm = :aTerm and co.externalUniqueId = :anExternalId").
 		setString("academicInititive", academicInitiative).
 		setString("aYear", year).
 		setString("aTerm", term).
 		setString("anExternalId", externalId).
 		setCacheable(true).
+		setMaxResults(1).
 		uniqueResult());
 
 	}
diff --git a/JavaSource/org/unitime/timetable/events/RoomFilterBackend.java b/JavaSource/org/unitime/timetable/events/RoomFilterBackend.java
index c11053b11d..b46f17f9aa 100644
--- a/JavaSource/org/unitime/timetable/events/RoomFilterBackend.java
+++ b/JavaSource/org/unitime/timetable/events/RoomFilterBackend.java
@@ -723,7 +723,7 @@ else if (!allRooms)
 			int id = 0;
 			for (String s: ids) {
 				list += (list.isEmpty() ? "" : ", ") + ":Xi" + id;
-				query.addParameter("id", "Xi" + id, s);
+				query.addParameter("id", "Xi" + id, Long.valueOf(s));
 				id++;
 			}
 			query.addWhere("id", "l.uniqueId in (" + list + ")");
diff --git a/JavaSource/org/unitime/timetable/form/ItypeDescEditForm.java b/JavaSource/org/unitime/timetable/form/ItypeDescEditForm.java
index b525cb9786..1a410a02f9 100644
--- a/JavaSource/org/unitime/timetable/form/ItypeDescEditForm.java
+++ b/JavaSource/org/unitime/timetable/form/ItypeDescEditForm.java
@@ -126,7 +126,7 @@ public void load(ItypeDesc itype) {
         setAbbreviation(itype.getAbbv());
         setName(itype.getDesc());
         setReference(itype.getSis_ref());
-        setBasicType(itype.getBasic());
+        setBasicType(itype.getBasic() ? 1 : 0);
         setParent(itype.getParent()==null?null:itype.getParent().getItype());
         setOrganized(itype.isOrganized());
     }
@@ -139,7 +139,7 @@ public void saveOrUpdate(org.hibernate.Session hibSession) throws Exception {
         itype.setAbbv(getAbbreviation());
         itype.setDesc(getName());
         itype.setSis_ref(getReference());
-        itype.setBasic(getBasicType());
+        itype.setBasic(getBasicType() == 1);
         itype.setParent(getParent()==null?null:new ItypeDescDAO().get(getParent()));
         itype.setOrganized(getOrganized());
         hibSession.saveOrUpdate(itype);
diff --git a/JavaSource/org/unitime/timetable/form/RollForwardSessionForm.java b/JavaSource/org/unitime/timetable/form/RollForwardSessionForm.java
index 09a5f61bfc..4a013cfe50 100644
--- a/JavaSource/org/unitime/timetable/form/RollForwardSessionForm.java
+++ b/JavaSource/org/unitime/timetable/form/RollForwardSessionForm.java
@@ -261,7 +261,7 @@ public void validateCourseOfferingRollForward(Session toAcadSession,ActionErrors
 			for (int i = 0; i < getRollForwardSubjectAreaIds().length; i++){
 				String queryStr = "from CourseOffering co where co.subjectArea.session.uniqueId = "
 					+ toAcadSession.getUniqueId().toString()
-					+ " and co.isControl = 1 and co.subjectArea.uniqueId  = '"
+					+ " and co.isControl = true and co.subjectArea.uniqueId  = '"
 				    + getRollForwardSubjectAreaIds()[i] + "'";
 				validateRollForwardSessionHasNoDataOfType(errors, toAcadSession, ("Course Offerings - " + getRollForwardSubjectAreaIds()[i]), coDao.getQuery(queryStr).list());
 			}			
@@ -275,7 +275,7 @@ public void validateClassInstructorRollForward(Session toAcadSession,ActionError
 			for (int i = 0; i < getRollForwardClassInstrSubjectIds().length; i++){
 				String queryStr = "from ClassInstructor c  inner join c.classInstructing.schedulingSubpart.instrOfferingConfig.instructionalOffering.courseOfferings as co where c.classInstructing.schedulingSubpart.instrOfferingConfig.instructionalOffering.session.uniqueId = "
 					+ toAcadSession.getUniqueId().toString()
-					+ " and co.isControl = 1 and co.subjectArea.uniqueId  = '"
+					+ " and co.isControl = true and co.subjectArea.uniqueId  = '"
 				    + getRollForwardClassInstrSubjectIds()[i] + "'";
 				validateRollForwardSessionHasNoDataOfType(errors, toAcadSession, ("Class Instructors - " + getRollForwardClassInstrSubjectIds()[i]), ciDao.getQuery(queryStr).list());
 			}			
@@ -289,7 +289,7 @@ public void validateOfferingCoordinatorsRollForward(Session toAcadSession,Action
 			for (int i = 0; i < getRollForwardOfferingCoordinatorsSubjectIds().length; i++){
 				String queryStr = "from OfferingCoordinator c inner join c.offering.courseOfferings as co where c.offering.session.uniqueId = "
 					+ toAcadSession.getUniqueId().toString()
-					+ " and co.isControl = 1 and co.subjectArea.uniqueId  = '"
+					+ " and co.isControl = true and co.subjectArea.uniqueId  = '"
 				    + getRollForwardOfferingCoordinatorsSubjectIds()[i] + "'";
 				validateRollForwardSessionHasNoDataOfType(errors, toAcadSession, ("Offering Coordinators - " + getRollForwardOfferingCoordinatorsSubjectIds()[i]), ocDao.getQuery(queryStr).list());
 			}			
diff --git a/JavaSource/org/unitime/timetable/model/Class_.java b/JavaSource/org/unitime/timetable/model/Class_.java
index 6179990a20..ae37dc8330 100644
--- a/JavaSource/org/unitime/timetable/model/Class_.java
+++ b/JavaSource/org/unitime/timetable/model/Class_.java
@@ -1013,7 +1013,7 @@ public static List findAllForControllingSubjectArea(String subjectAreaAbbv, Long
     public static List findAllForControllingSubjectArea(String subjectAreaAbbv, Long sessionId, org.hibernate.Session hibSession) {
     	return hibSession.
     		createQuery("select distinct c from Class_ c inner join c.schedulingSubpart.instrOfferingConfig.instructionalOffering.courseOfferings as co where " +
-    				"co.subjectArea.subjectAreaAbbreviation=:subjectAreaAbbv and c.schedulingSubpart.instrOfferingConfig.instructionalOffering.session.uniqueId=:sessionId and co.isControl=1").
+    				"co.subjectArea.subjectAreaAbbreviation=:subjectAreaAbbv and c.schedulingSubpart.instrOfferingConfig.instructionalOffering.session.uniqueId=:sessionId and co.isControl=true").
     		setString("subjectAreaAbbv",subjectAreaAbbv).
     		setLong("sessionId",sessionId.longValue()).
 			setFlushMode(FlushMode.MANUAL).
diff --git a/JavaSource/org/unitime/timetable/model/Department.java b/JavaSource/org/unitime/timetable/model/Department.java
index 2ea651cd10..216d24af6e 100644
--- a/JavaSource/org/unitime/timetable/model/Department.java
+++ b/JavaSource/org/unitime/timetable/model/Department.java
@@ -75,7 +75,7 @@ public static TreeSet<Department> findAll(Long sessionId) {
 	public static TreeSet<Department> findAllExternal(Long sessionId) {
 		return new TreeSet<Department>((new DepartmentDAO()).
 				getSession().
-				createQuery("select distinct d from Department as d where d.externalManager=1 and d.session.uniqueId=:sessionId").
+				createQuery("select distinct d from Department as d where d.externalManager=true and d.session.uniqueId=:sessionId").
 				setLong("sessionId", sessionId.longValue()).
 				setCacheable(true).
 				list());
@@ -84,7 +84,7 @@ public static TreeSet<Department> findAllExternal(Long sessionId) {
     public static TreeSet findAllNonExternal(Long sessionId) {
         return new TreeSet((new DepartmentDAO()).
                 getSession().
-                createQuery("select distinct d from Department as d where d.externalManager=0 and d.session.uniqueId=:sessionId").
+                createQuery("select distinct d from Department as d where d.externalManager=false and d.session.uniqueId=:sessionId").
                 setLong("sessionId", sessionId.longValue()).
                 setCacheable(true).
                 list());
diff --git a/JavaSource/org/unitime/timetable/model/ItypeDesc.java b/JavaSource/org/unitime/timetable/model/ItypeDesc.java
index ea386da915..3292f552d3 100644
--- a/JavaSource/org/unitime/timetable/model/ItypeDesc.java
+++ b/JavaSource/org/unitime/timetable/model/ItypeDesc.java
@@ -53,14 +53,13 @@ public static TreeSet<ItypeDesc> findAll(boolean basic) {
         return new TreeSet<ItypeDesc>(
                 new ItypeDescDAO().
                 getSession().
-                createQuery("select i from ItypeDesc i"+(basic?" where i.basic=1":"")).
+                createQuery("select i from ItypeDesc i"+(basic?" where i.basic = true":"")).
                 setCacheable(true).
                 list());
     }
 
     public String getBasicType() {
-        if (getBasic()>=0 && getBasic()<sBasicTypes.length) return sBasicTypes[getBasic()];
-        return "Unknown";
+    	return sBasicTypes[getBasic() ? 1 : 0];
     }
     
     public int compareTo(Object o) {
diff --git a/JavaSource/org/unitime/timetable/model/StudentSectioningQueue.java b/JavaSource/org/unitime/timetable/model/StudentSectioningQueue.java
index 8181265e6c..a9bf1361d5 100644
--- a/JavaSource/org/unitime/timetable/model/StudentSectioningQueue.java
+++ b/JavaSource/org/unitime/timetable/model/StudentSectioningQueue.java
@@ -19,6 +19,9 @@
 */
 package org.unitime.timetable.model;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -27,8 +30,13 @@
 import java.util.TreeSet;
 
 import org.dom4j.Document;
+import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+import org.hibernate.HibernateException;
 import org.unitime.timetable.model.base.BaseStudentSectioningQueue;
 import org.unitime.timetable.onlinesectioning.OnlineSectioningLog;
 import org.unitime.timetable.security.UserContext;
@@ -83,6 +91,30 @@ public static Date getLastTimeStamp(org.hibernate.Session hibSession, Long sessi
 			return (Date) hibSession.createQuery("select max(q.timeStamp) from StudentSectioningQueue q").uniqueResult();
 			
 	}
+	
+	public Document getMessage() {
+		try {
+			return new SAXReader().read(new StringReader(getData()));
+		} catch (DocumentException e) {
+			throw new HibernateException(e.getMessage(),e);
+		}
+	}
+	
+	public void setMessage(Document document) {
+		try {
+			if (document == null) {
+				setData(null);
+			} else {
+				StringWriter string = new StringWriter();
+				XMLWriter writer = new XMLWriter(string, OutputFormat.createCompactFormat());
+				writer.write(document);
+				writer.flush(); writer.close();
+				setData(string.toString());
+			}
+		} catch (IOException e) {
+			throw new HibernateException(e.getMessage(),e);
+		}
+	}
 
 	@Override
 	public int compareTo(StudentSectioningQueue q) {
diff --git a/JavaSource/org/unitime/timetable/model/base/BaseChangeLog.java b/JavaSource/org/unitime/timetable/model/base/BaseChangeLog.java
index ae8cb0d01d..f564135aa6 100644
--- a/JavaSource/org/unitime/timetable/model/base/BaseChangeLog.java
+++ b/JavaSource/org/unitime/timetable/model/base/BaseChangeLog.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.dom4j.Document;
 import org.unitime.timetable.model.ChangeLog;
 import org.unitime.timetable.model.Department;
 import org.unitime.timetable.model.Session;
@@ -43,7 +42,7 @@ public abstract class BaseChangeLog implements Serializable {
 	private Long iObjectUniqueId;
 	private String iSourceString;
 	private String iOperationString;
-	private Document iDetail;
+	private byte[] iDetail;
 
 	private Session iSession;
 	private TimetableManager iManager;
@@ -91,8 +90,8 @@ protected void initialize() {}
 	public String getOperationString() { return iOperationString; }
 	public void setOperationString(String operationString) { iOperationString = operationString; }
 
-	public Document getDetail() { return iDetail; }
-	public void setDetail(Document detail) { iDetail = detail; }
+	public byte[] getDetail() { return iDetail; }
+	public void setDetail(byte[] detail) { iDetail = detail; }
 
 	public Session getSession() { return iSession; }
 	public void setSession(Session session) { iSession = session; }
diff --git a/JavaSource/org/unitime/timetable/model/base/BaseItypeDesc.java b/JavaSource/org/unitime/timetable/model/base/BaseItypeDesc.java
index f686ff14eb..a3fb641119 100644
--- a/JavaSource/org/unitime/timetable/model/base/BaseItypeDesc.java
+++ b/JavaSource/org/unitime/timetable/model/base/BaseItypeDesc.java
@@ -34,7 +34,7 @@ public abstract class BaseItypeDesc implements Serializable {
 	private String iAbbv;
 	private String iDesc;
 	private String iSis_ref;
-	private Integer iBasic;
+	private Boolean iBasic;
 	private Boolean iOrganized;
 
 	private ItypeDesc iParent;
@@ -69,8 +69,9 @@ protected void initialize() {}
 	public String getSis_ref() { return iSis_ref; }
 	public void setSis_ref(String sis_ref) { iSis_ref = sis_ref; }
 
-	public Integer getBasic() { return iBasic; }
-	public void setBasic(Integer basic) { iBasic = basic; }
+	public Boolean isBasic() { return iBasic; }
+	public Boolean getBasic() { return iBasic; }
+	public void setBasic(Boolean basic) { iBasic = basic; }
 
 	public Boolean isOrganized() { return iOrganized; }
 	public Boolean getOrganized() { return iOrganized; }
diff --git a/JavaSource/org/unitime/timetable/model/base/BaseStudentSectHistory.java b/JavaSource/org/unitime/timetable/model/base/BaseStudentSectHistory.java
index 0e531eac1d..93c282f037 100644
--- a/JavaSource/org/unitime/timetable/model/base/BaseStudentSectHistory.java
+++ b/JavaSource/org/unitime/timetable/model/base/BaseStudentSectHistory.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.dom4j.Document;
 import org.unitime.timetable.model.Student;
 import org.unitime.timetable.model.StudentSectHistory;
 
@@ -34,7 +33,7 @@ public abstract class BaseStudentSectHistory implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private Long iUniqueId;
-	private Document iData;
+	private byte[] iData;
 	private Integer iType;
 	private Date iTimestamp;
 
@@ -59,8 +58,8 @@ protected void initialize() {}
 	public Long getUniqueId() { return iUniqueId; }
 	public void setUniqueId(Long uniqueId) { iUniqueId = uniqueId; }
 
-	public Document getData() { return iData; }
-	public void setData(Document data) { iData = data; }
+	public byte[] getData() { return iData; }
+	public void setData(byte[] data) { iData = data; }
 
 	public Integer getType() { return iType; }
 	public void setType(Integer type) { iType = type; }
diff --git a/JavaSource/org/unitime/timetable/model/base/BaseStudentSectioningQueue.java b/JavaSource/org/unitime/timetable/model/base/BaseStudentSectioningQueue.java
index 5aacb9bf11..8892ccd453 100644
--- a/JavaSource/org/unitime/timetable/model/base/BaseStudentSectioningQueue.java
+++ b/JavaSource/org/unitime/timetable/model/base/BaseStudentSectioningQueue.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import org.dom4j.Document;
 import org.unitime.timetable.model.StudentSectioningQueue;
 
 /**
@@ -36,14 +35,14 @@ public abstract class BaseStudentSectioningQueue implements Serializable {
 	private Long iSessionId;
 	private Date iTimeStamp;
 	private Integer iType;
-	private Document iMessage;
+	private String iData;
 
 
 	public static String PROP_UNIQUEID = "uniqueId";
 	public static String PROP_SESSION_ID = "sessionId";
 	public static String PROP_TIME_STAMP = "timeStamp";
 	public static String PROP_TYPE = "type";
-	public static String PROP_MESSAGE = "message";
+	public static String PROP_MESSAGE = "data";
 
 	public BaseStudentSectioningQueue() {
 		initialize();
@@ -68,8 +67,8 @@ protected void initialize() {}
 	public Integer getType() { return iType; }
 	public void setType(Integer type) { iType = type; }
 
-	public Document getMessage() { return iMessage; }
-	public void setMessage(Document message) { iMessage = message; }
+	public String getData() { return iData; }
+	public void setData(String data) { iData = data; }
 
 	public boolean equals(Object o) {
 		if (o == null || !(o instanceof StudentSectioningQueue)) return false;
@@ -88,7 +87,7 @@ public String toString() {
 
 	public String toDebugString() {
 		return "StudentSectioningQueue[" +
-			"\n	Message: " + getMessage() +
+			"\n	Data: " + getData() +
 			"\n	SessionId: " + getSessionId() +
 			"\n	TimeStamp: " + getTimeStamp() +
 			"\n	Type: " + getType() +
diff --git a/JavaSource/org/unitime/timetable/model/base/_BaseRootDAO.java b/JavaSource/org/unitime/timetable/model/base/_BaseRootDAO.java
index a69cdb6b25..5c7c8179f1 100644
--- a/JavaSource/org/unitime/timetable/model/base/_BaseRootDAO.java
+++ b/JavaSource/org/unitime/timetable/model/base/_BaseRootDAO.java
@@ -72,6 +72,7 @@ public static void initialize (String configFileName, Configuration configuratio
         sConfiguration = configuration;
         setSessionFactory(configuration.buildSessionFactory());
         HibernateUtil.addBitwiseOperationsToDialect();
+        HibernateUtil.addAddDateToDialect();
         DatabaseUpdate.update();
 	}
 
diff --git a/JavaSource/org/unitime/timetable/security/permissions/AdministrationPermissions.java b/JavaSource/org/unitime/timetable/security/permissions/AdministrationPermissions.java
index 6125a7a7d5..17b815c969 100644
--- a/JavaSource/org/unitime/timetable/security/permissions/AdministrationPermissions.java
+++ b/JavaSource/org/unitime/timetable/security/permissions/AdministrationPermissions.java
@@ -93,7 +93,7 @@ public boolean check(UserContext user, Department source) {
 			
 			int nrOffered = ((Number)DepartmentDAO.getInstance().getSession().
                     createQuery("select count(io) from CourseOffering co inner join co.instructionalOffering io " +
-                    		"where co.subjectArea.department.uniqueId=:deptId and io.notOffered = 0").
+                    		"where co.subjectArea.department.uniqueId=:deptId and io.notOffered = false").
                     setLong("deptId", source.getUniqueId()).setCacheable(true).uniqueResult()).intValue();
             
 			return nrOffered == 0;
diff --git a/JavaSource/org/unitime/timetable/test/ImportPreferences.java b/JavaSource/org/unitime/timetable/test/ImportPreferences.java
index 40e3316c0e..94d16e1ced 100644
--- a/JavaSource/org/unitime/timetable/test/ImportPreferences.java
+++ b/JavaSource/org/unitime/timetable/test/ImportPreferences.java
@@ -264,7 +264,7 @@ else if (p instanceof RoomGroupPref)
 	public Department getDepartment(String deptCode) {
 		if ("LLR".equals(deptCode) || "LAB".equals(deptCode)) {
 			return (Department)hibSession.
-			createQuery("select d from Department d where d.session.uniqueId=:sessionId and d.externalManager=1 and d.externalMgrAbbv=:deptCode").
+			createQuery("select d from Department d where d.session.uniqueId=:sessionId and d.externalManager=true and d.externalMgrAbbv=:deptCode").
 			setLong("sessionId", iSession.getUniqueId().longValue()).
 			setString("deptCode",deptCode).
 			uniqueResult();
diff --git a/JavaSource/org/unitime/timetable/util/InstructionalOfferingRollForward.java b/JavaSource/org/unitime/timetable/util/InstructionalOfferingRollForward.java
index 45227921d5..31296ef0ef 100644
--- a/JavaSource/org/unitime/timetable/util/InstructionalOfferingRollForward.java
+++ b/JavaSource/org/unitime/timetable/util/InstructionalOfferingRollForward.java
@@ -65,7 +65,7 @@ public InstructionalOfferingRollForward(Log log) {
 	public void rollForwardInstructionalOfferingsForASubjectArea(String subjectAreaAbbreviation, Session fromSession, Session toSession){
 		CourseOfferingDAO coDao = new CourseOfferingDAO();
 		String query = "from CourseOffering as co where co.subjectArea.subjectAreaAbbreviation = '" + subjectAreaAbbreviation
-			+ "' and co.isControl = 1"
+			+ "' and co.isControl = true"
 			+ " and co.subjectArea.session.uniqueId = " + fromSession.getUniqueId();
 		List l = coDao.getQuery(query).list();
 		if (l != null){
@@ -81,7 +81,7 @@ public void rollForwardExpiredInstructionalOfferingsForASubjectArea(String subje
 		String query = "select co from CourseOffering co"
 				+ " where co.subjectArea.subjectAreaAbbreviation = '" + subjectAreaAbbreviation + "'"
 				+ "  and co.subjectArea.session.uniqueId = " + fromSession.getUniqueId().longValue()
-				+ "  and co.isControl = 1"
+				+ "  and co.isControl = true"
 				+ "  and co.instructionalOffering.notOffered = false"
 				+ "  and 0 = (select count(cc) from CourseCatalog cc"
 				+ " where cc.session.uniqueId = " + toSession.getUniqueId().longValue()
@@ -172,7 +172,7 @@ public void rollForwardInstructionalOfferingsForACourseOffering(String subjectAr
 		CourseOfferingDAO coDao = new CourseOfferingDAO();
 		String query = "from CourseOffering as co where co.subjectArea.subjectAreaAbbreviation = '" + subjectAreaAbbreviation
 		+ "' and co.getCourseNbr = '" + courseNumber
-		+ "' and co.isControl = 1"
+		+ "' and co.isControl = true"
 		+ " and co.subjectArea.session.uniqueId = " + fromSession.getUniqueId();
 		List l = coDao.getQuery(query).list();
 		if (l != null && l.size() > 0){
diff --git a/JavaSource/org/unitime/timetable/util/LookupTables.java b/JavaSource/org/unitime/timetable/util/LookupTables.java
index 8b7acccf10..3c06197518 100644
--- a/JavaSource/org/unitime/timetable/util/LookupTables.java
+++ b/JavaSource/org/unitime/timetable/util/LookupTables.java
@@ -296,7 +296,6 @@ private static void getInstructors(HttpServletRequest request, SessionContext co
 		query.append("select distinct i from DepartmentalInstructor i ");
 		query.append(" where i.department.session.uniqueId = :acadSessionId ");
 		query.append(clause);
-        query.append(" order by upper(i.lastName), upper(i.firstName) ");
         
         DepartmentalInstructorDAO idao = new DepartmentalInstructorDAO();
 		org.hibernate.Session hibSession = idao.getSession();
@@ -309,6 +308,7 @@ private static void getInstructors(HttpServletRequest request, SessionContext co
 		List result = q.list();
         Vector v = new Vector(result.size());
         Vector h = new Vector(result.size());
+        Collections.sort(result);
 	    for (Iterator i=result.iterator();i.hasNext();) {
             DepartmentalInstructor di = (DepartmentalInstructor)i.next();
             String name = di.getName(instructorNameFormat);