Bug fixes (intial select state)