Search engine + router improvements + some bug fixes