Fixed issue with selector extractor
Updates