Fixed SELECTED functionality