Fix to 'mn' alias.
Added a TODO
Refactored search code. Fixed a bug in sample command.