Bug corrections, now keeps state of filters selection