Fixes for ticket 100 - Changeset17.sql

[#100 state:fixed responsible:none milestone:v2.1.5]