Added cluster info, prevent hidden from showing. etc