Adding "group" criteria and remove group selection from current criteria
Fix search bug
Now environments are only retrieve if they match a group
Adding environment filtering with group