Added search fields for 'service catalog' and 'device environment'.