Loading of OnlyShowIn & Various bug fixes