fixing evaluation and fixing el extractors