Update finders which are breaking remove_pages
Update finders which are breaking reorder pages.