Adding positive look-ahead for And/Or matching in dynamic query.

Signed-off-by: Ben Corlett <bencorlett@me.com>