fix validation & pagination