Refactored ViewCommand & SearchCommand