added filter & prev, next for modal