Daniel, there was a bunch of feedback from Dmitry about the patch and a couple of other comments. Do you plan to produce a new version? It would be good to get this applied - it allows us to address various comments that have been made about unifying the different search mechanisms and looks generally useful.