Sanity Commit: Dev env. Moved old search to .old reverted back David's changes.