re #926 - Code cleanup and implemented pagination on district view