added will_paginate and removed unused filters