z-order and search manager fixes
Trying again for z-order fixes