Fix bugs and add date result view