Fix bug in filtering lines in the accounting report
Allow users to skip option selection if there are no options to select
Fix name clash