adding fix for kaminari and will_paginate issues