Small fixes. Move to WU autocomplete system to make general queries better.