Issue submit,pagination fix