Handle special columns properly when ending a search (Issue #782)

I believe that this fixes #782 (closed), but I'll wait for !238 (merged) and !239 (merged) to properly test it.