fixed paging, added decrementing match count on deletion