JIRA OOIION-1550

update to filtering list method to ensure only selected item are presented

re generates the list everytime rather than trying to be clever, this ensures that the list is correct everytime