update match indices
OR -> AND, duh
use hard coded regex, for now