Fixed bugs involving layer names

Fixed bug where the name of a folder layer was not being made safe.

Fixed bug where the + character wasn't being replaced..

Changed the overloads of Contains and Replace to ContainsIgnoreCase and
ReplaceIgnoreCase.