Entity SP: work
Comment SP: CSS fix