Group filtering into search, add boxe without troubling current search
Adding environment filtering; search is now grouped