Removed unnecessary conditions
Fixed replaceEntities, default preset, improved coverage