Version 2.3 - Modifications for improved search functionality

Resolved tickets - 36,61,62,63,64