Fixes and tests for selector extender