Make search optional per activity