Make the context selector work as specified