still no success
Refactoring
Resulting to RAW SQL :(
Fix branch renaming in new plans :)