Add pager & fixing searching function