fix timeline filtering to use AND