Order notes helper implementation refactor and bugfix.