Changed retrieving of navigation selector