Added DB population file and fixed of pagination