Version 3.2 - Modifications for Improved Search and Reference Overlays

Resolved tickets # 40 and 66