Modified search query

Implemented searching with actual names instead of ObjectIds