fixes #22
Merge branch 'bug/22-nas-fee-search-error' into dev