Improve cols and form search modules