Fixed adding match metadata and data prepared statements.