Iss 154 move search form