updated templates to use _id and corrected bug w/ focused match view