Make/Compile messages. Rework search form