Version 4.2 - Modifications for improved search functionality

Resolved ticket #34