Revert "Removed unused refferences"

This reverts commit 82a032bbf3047790c9cc9add9bbd35b8344a35b3.
Search bug fixed string null empty