Fixed pagination and search issues (rows param)