Added specs and pagination on match index