fix few issues with filtering activity store