#89 Added search query code to values="" field so it will retain the last search