improving the prepared statement matcher a lot