add comment option, fix search