Edited index to have search fields