Added Fix for passsing in search:options and search:term-options from external source via map;parameters