Added basic search support.