Fix from OXID forum and codestyling

See forum