[IMP] Improved code. used loop instead of single browseable record