[BUG #7273] fixed separator removal
[BUG #7273] updated custom decorator
[BUG #7273] updated custom decorators