Change match object structure to {field:{op:val}}