Code refactoring of search part
Revert "Code refactoring of search part"

This reverts commit 90aeb3bdd7ebaa260e73809f5e8a09b60261bfd8.
Code refactoring of seach part
modify storage part
final fix for start > end for date and time
Merge remote-tracking branch 'origin/khye_an'
Merge remote-tracking branch 'origin/khye_an'