Search changes

This request involves fixes for:
* Search 
* Work: fix for constraint editing/display and saving
* Copy: remove unused macro

Fixes for DSC 333, 397, 398