fix #6,#7 - added parameter limit and offset