Added mask support for ZoneTrigger and Search methods