moved over pagination; fixed searching on type along