Search field behaves weirdly. Fix #69 and fix #66