fjunior: two timelines now, with and without category filter
fjunior: merging