added search ability by location and type