Some improvments and changes based on the new FilterOptionCollectionInterface. Remove the old handling for collections and add support for the new "FilterOptionCollectionInterface".