- [query] fixes on option hiding.