Small optimizations

See
https://github.com/voolia/de.voolia.cms/commit/7411246d959ea78aef3847142
37cdada08f38d18