fixed ActivitySelector and externalized SelectorAdapter