fix few issues with repeatable filtering