Elem match implement

with _id support and fixes