Updates 3.0

Added search group + minor fix