several fixes. fixed pagination. more clode cleaning for future app support