Added some max record management code to deleteByQuery and extended the timeout