partial fix for non publish contents