Added logic for only one search field added.