[FIX] all the previousl fixes + resolve problem of planned hors duplication

Fixes bug lp:1212860, opw 607062