Fix caption, improve search