Refactored by jurchicks' request

rate by ID doesn't stack with standard rates anymore, it overrides standard retes instead (as it did prior this rework)

fixed few small bugs