Fixed error in handling offset/limit options