added fix for filtered selection issue but unable to test