fix group search, moved bus logic to model, clean tag