Search is now working. Still waiting for further modifications.