Added 'mark' command and filtering