Patch bug#1 + pushing new date into source list
Need a complete rewriting of filter mode