Add partial support for "search=" URL parameter - coding style fixes