Improving search
removed old form