Merge pull request #4 from rpspringuel/master

Bugfix: bug #21784
fixing bug with flatted keys
tiny cleanups
fixing custo blocking