6.15.z-alernative solution for default subscription search option

6.15.z-alernative solution for default subscription search option #6280