CORE-5024: Removed ability to hide selection/reference based arguments

My changes for CORE-5024. Please review and provide feedback.