JAL-2816 tweaks to feature visibility checks