Merge pull request #2145 from nabinhait/hotfix

Minor fixes
[hotfix] hooks - recurring order
minor fixes