It looks like @esx added this commit after I last pulled in this branch. That's why I wasn't seeing the changes in my local environment. @esx could you make a pass of this and make sure that you're being consistent with "selection"?

Thanks.