filtering and sorting templates fixed
  filtering and sorting templates fixed