Revert "using search widget in search activity itself"

This reverts commit 06b222357fdd119529b0b7b4313f2076cb29a641.
POC complete