[#739] Partially revert 7d1266 as extensions needs 'extras' on after_search