[IEXP-156, IEXP-21] changed indexing for layout and search changes
[IEXP-156, IEXP-21] changed indexing for layout and search changes

upconsulting/IsisCB,upconsulting/IsisCB,upconsulting/IsisCB,upconsulting/IsisCB